[ros-diffs] [nyadav] 52161: [AUDSRV] Following Naming Convention for Functions

Author: nyadav
Date: Thu Jun  9 18:31:59 2011
New Revision: 52161
URL: http://svn.reactos.org/svn/reactos?rev=52161&view=rev
Log:
[AUDSRV] Following Naming Convention for Functions
Modified:
    branches/nyadav-audio-branch/base/services/audsrv/audsrv.c
    branches/nyadav-audio-branch/base/services/audsrv/audsrv.h
    branches/nyadav-audio-branch/base/services/audsrv/mixer.c
    branches/nyadav-audio-branch/base/services/audsrv/rpc.c
    branches/nyadav-audio-branch/base/services/audsrv/stream.c
Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c
URL:
http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic…
==============================================================================
--- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Thu Jun  9
18:31:59 2011
@@ -14,7 +14,7 @@
 static DWORD ServiceInit(VOID);
-static BOOL WINAPI close (DWORD dwCtrlType);
+static BOOL WINAPI Close (DWORD dwCtrlType);
 static WCHAR ServiceName[] = L"AudSrv";
@@ -80,7 +80,7 @@
     {
         case SERVICE_CONTROL_STOP:
             DPRINT("  SERVICE_CONTROL_STOP received\n");
-            close(CTRL_CLOSE_EVENT);
+            Close(CTRL_CLOSE_EVENT);
             UpdateServiceStatus(SERVICE_STOPPED);
             return ERROR_SUCCESS;
@@ -102,7 +102,7 @@
         case SERVICE_CONTROL_SHUTDOWN:
             DPRINT("  SERVICE_CONTROL_SHUTDOWN received\n");
-            close(CTRL_CLOSE_EVENT);
+            Close(CTRL_CLOSE_EVENT);
             UpdateServiceStatus(SERVICE_STOPPED);
             return ERROR_SUCCESS;
@@ -156,7 +156,7 @@
   *This functions fetches FilteredBuffer from Every ClientStream Stucture
   *and mixes them in oder to feed player thread*/
 void
-mixandfill(MixerEngine * mixer,
+MixAndFill(MixerEngine * mixer,
            int buffer)
 {
     while(WaitForSingleObject(mixer->streampresent,
@@ -172,16 +172,16 @@
         switch(mixer->masterbitspersample)
         {
             case 8:
-                mixs8(mixer,buffer);
+                MixS8(mixer,buffer);
                 break;
             case 16:
-                mixs16(mixer,buffer);
+                MixS16(mixer,buffer);
                 break;
             case 32:
-                mixs32(mixer,buffer);
+                MixS32(mixer,buffer);
                 break;
             case 64:
-                mixs64(mixer,buffer);
+                MixS64(mixer,buffer);
                 break;
         }
     }
@@ -190,16 +190,16 @@
         switch(mixer->masterbitspersample)
         {
             case 8:
-                mixu8(mixer,buffer);
+                MixU8(mixer,buffer);
                 break;
             case 16:
-                mixu16(mixer,buffer);
+                MixU16(mixer,buffer);
                 break;
             case 32:
-                mixu32(mixer,buffer);
+                MixU32(mixer,buffer);
                 break;
             case 64:
-                mixu64(mixer,buffer);
+                MixU64(mixer,buffer);
                 break;
         }
     }
@@ -208,17 +208,17 @@
         switch(mixer->masterbitspersample)
         {
             case 32:
-                mixfl32(mixer,buffer);
+                MixFL32(mixer,buffer);
                 break;
             case 64:
-                mixfl64(mixer,buffer);
+                MixFL64(mixer,buffer);
                 break;
         }
     }
 }
 /*Frees the Buffer Created in mixer thread*/
-void freebuffer()
+void FreeBuffer()
 {
     HeapFree(GetProcessHeap(),
              0,
@@ -228,7 +228,8 @@
 }
 /*Plays Master buffer pengine->masterbuf[pengine->playcurrent]*/
-void playbuffer(MixerEngine * mixer,int buffer)
+void PlayBuffer(MixerEngine * mixer,
+                int buffer)
 {
     SP_DEVICE_INTERFACE_DATA InterfaceData;
     SP_DEVINFO_DATA DeviceData;
@@ -436,7 +437,7 @@
         if(mixer->dead)
             break;
-        mixandfill(mixer,
+        MixAndFill(mixer,
                    1-mixer->playcurrent);
         SetEvent(mixer->filled);
@@ -463,10 +464,10 @@
             break;
         SetEvent(mixer->played);
-        playbuffer(mixer,
+        PlayBuffer(mixer,
                    mixer->playcurrent);
-        freebuffer();
+        FreeBuffer();
         mixer->playcurrent=1-mixer->playcurrent;
     }
@@ -530,7 +531,7 @@
 }
 /*This Functions Kills the application, in any condition*/
-static BOOL WINAPI close ( DWORD dwCtrlType )
+static BOOL WINAPI Close ( DWORD dwCtrlType )
 {
     pengine->dead=1;
@@ -587,7 +588,7 @@
                                            FALSE,
                                            NULL);
-        SetConsoleCtrlHandler(close,
+        SetConsoleCtrlHandler(Close,
                               TRUE);
         SpawnMixerThread(pengine);
@@ -625,7 +626,7 @@
     pengine->played=CreateEvent(NULL,FALSE,FALSE,NULL);
     pengine->filled=CreateEvent(NULL,FALSE,FALSE,NULL);
     pengine->streampresent=CreateEvent(NULL,TRUE,FALSE,NULL);
-    SetConsoleCtrlHandler(close,TRUE);
+    SetConsoleCtrlHandler(Close,TRUE);
     SpawnMixerThread(pengine);
     SpawnPlayerThread(pengine);
     SpawnRPCThread(pengine);
Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic…
==============================================================================
--- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Thu Jun  9
18:31:59 2011
@@ -99,14 +99,14 @@
 DWORD WINAPI RunRPCThread(LPVOID lpParameter);
 /* audsrv.c*/
-void mixandfill(MixerEngine * mixer,
+void MixAndFill(MixerEngine * mixer,
                 int buffer);
-void playbuffer(MixerEngine * mixer,
+void PlayBuffer(MixerEngine * mixer,
                 int buffer);
 /*stream.c*/
-long getnewstreamid();
-long addstream(LONG frequency,
+long GetNewStreamID();
+long AddStream(LONG frequency,
                int channels,
                int bitspersample,
                int datatype,
@@ -116,34 +116,34 @@
                float balance);
 /*mixer.c*/
-void * mixs8(MixerEngine * mixer,
+void * MixS8(MixerEngine * mixer,
              int buffer);
-void * mixs16(MixerEngine * mixer,
+void * MixS16(MixerEngine * mixer,
               int buffer);
-void * mixs32(MixerEngine * mixer,
+void * MixS32(MixerEngine * mixer,
               int buffer);
-void * mixs64(MixerEngine * mixer,
+void * MixS64(MixerEngine * mixer,
               int buffer);
-void * mixu8(MixerEngine * mixer,
+void * MixU8(MixerEngine * mixer,
              int buffer);
-void * mixu16(MixerEngine * mixer,
+void * MixU16(MixerEngine * mixer,
               int buffer);
-void * mixu32(MixerEngine * mixer,
+void * MixU32(MixerEngine * mixer,
               int buffer);
-void * mixu64(MixerEngine * mixer,
+void * MixU64(MixerEngine * mixer,
               int buffer);
-void * mixfl32(MixerEngine * mixer,
+void * MixFL32(MixerEngine * mixer,
                int buffer);
-void * mixfl64(MixerEngine * mixer,
+void * MixFL64(MixerEngine * mixer,
                int buffer);
 #endif  /* __AUDSRV_H__ */
Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c
URL:
http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic…
==============================================================================
--- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Thu Jun  9
18:31:59 2011
@@ -8,11 +8,11 @@
  */
 #include "audsrv.h"
-void * mixs8(MixerEngine * mixer,int buffer)
+void * MixS8(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
-void * mixs16(MixerEngine * mixer,int buffer)
+void * MixS16(MixerEngine * mixer,int buffer)
 {
     mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0,
mixer->serverstreamlist->length_filtered);
CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered);
@@ -20,35 +20,35 @@
     return NULL;
 }
-void * mixs32(MixerEngine * mixer,int buffer)
+void * MixS32(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
-void * mixs64(MixerEngine * mixer,int buffer)
+void * MixS64(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
-void * mixu8(MixerEngine * mixer,int buffer)
+void * MixU8(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
-void * mixu16(MixerEngine * mixer,int buffer)
+void * MixU16(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
-void * mixu32(MixerEngine * mixer,int buffer)
+void * MixU32(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
-void * mixu64(MixerEngine * mixer,int buffer)
+void * MixU64(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
-void * mixfl32(MixerEngine * mixer,int buffer)
+void * MixFL32(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
-void * mixfl64(MixerEngine * mixer,int buffer)
+void * MixFL64(MixerEngine * mixer,int buffer)
 {
     return NULL;
 }
Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c
URL:
http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic…
==============================================================================
--- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Thu Jun  9
18:31:59 2011
@@ -55,7 +55,7 @@
 {
     long stream;
-    stream = addstream(frequency,
+    stream = AddStream(frequency,
                        channels,
                        bitspersample,
                        datatype,
Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c
URL:
http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic…
==============================================================================
--- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Thu Jun  9
18:31:59 2011
@@ -9,7 +9,7 @@
 #include "audsrv.h"
-long getnewstreamid()
+long GetNewStreamID()
 {
     long streamid= pengine->streamidpool;
     pengine->streamidpool+=1;
@@ -88,7 +88,7 @@
     /*Clean Stream's data*/
 }
-long addstream(LONG frequency,int channels,int bitspersample,int datatype, ULONG
channelmask,int volume,int mute,float balance)
+long AddStream(LONG frequency,int channels,int bitspersample,int datatype, ULONG
channelmask,int volume,int mute,float balance)
 {
     ServerStream * newstream,*localstream;
     DWORD dwID;
@@ -175,7 +175,7 @@
     WaitForSingleObject(newstream->threadready,
                         INFINITE);
-    newstream->streamid=getnewstreamid();
+    newstream->streamid=GetNewStreamID();
     if(localstream == NULL)
     {