[ros-diffs] [nyadav] 52162: [AUDSRV] Fix Function Names to Conventions

[nyadav at svn.reactos.org]

Author: nyadav
Date: Thu Jun  9 18:43:48 2011
New Revision: 52162

URL: http://svn.reactos.org/svn/reactos?rev=52162&view=rev
Log:
[AUDSRV] Fix Function Names to Conventions

Modified:
    branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c
    branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec
    branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c

Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c
URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c?rev=52162&r1=52161&r2=52162&view=diff
==============================================================================
--- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Thu Jun  9 18:43:48 2011
@@ -14,7 +14,7 @@
 /*Initialize an audio stream
  *Return -1 if callbacks are NULL pointers
  */
-WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance)
+WINAPI int InitStream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance)
 {
     long streamid;
 
@@ -61,7 +61,7 @@
     return 0;
 }
 
-WINAPI int playaudio ( ClientStream * clientstream )
+WINAPI int PlayAudio ( ClientStream * clientstream )
 {
     /*This is an ActiveScheduler*/
     clientstream->callbacks.OpenComplete(0);
@@ -85,12 +85,11 @@
     }
     clientstream->callbacks.PlayComplete(0);
 
-DEAD:
 /*Audio Thread Ended*/
     return 0;
 }
 
-WINAPI int stopaudio (ClientStream * clientstream )
+WINAPI int StopAudio (ClientStream * clientstream )
 {
     /*Server Side termination is remaining*/
     /*If connected Properly call the remote audsrv_stop() function*/

Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec
URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec?rev=52162&r1=52161&r2=52162&view=diff
==============================================================================
--- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] Thu Jun  9 18:43:48 2011
@@ -1,6 +1,6 @@
-@ stdcall initstream (ptr long long long long long long long long)
-@ stdcall playaudio ( ptr);
-@ stdcall stopaudio (ptr );
+@ stdcall InitStream (ptr long long long long long long long long)
+@ stdcall PlayAudio ( ptr);
+@ stdcall StopAudio (ptr );
 @ stdcall Volume(ptr ptr );
 @ stdcall SetVolume(ptr long);
 @ stdcall Write(ptr ptr);

Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c
URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c?rev=52162&r1=52161&r2=52162&view=diff
==============================================================================
--- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Thu Jun  9 18:43:48 2011
@@ -13,16 +13,16 @@
 #include <audsrvapi.h>
 #include <stdio.h>
 
-void opencomplete (int error );
-void buffercopied (int error );
-void playcomplete (int error );
+void OpenComplete (int error );
+void BufferCopied (int error );
+void PlayComplete (int error );
 
 ClientStream clientstream = {0,
                              0,
                              {NULL},
-                                {opencomplete,
-                                 buffercopied,
-                                 playcomplete}
+                                {OpenComplete,
+                                 BufferCopied,
+                                 PlayComplete}
                             };
 
 DWORD WINAPI RunAudioThread(LPVOID param)
@@ -32,18 +32,18 @@
 
     return 0;
 }
-void opencomplete (int error )
+void OpenComplete (int error )
 {
     /*Copy First Buffer and write*/
     Write(&clientstream,
           "HELLO_RANDOM_STRING");
 }
-void buffercopied (int error )
+void BufferCopied (int error )
 {
     Write(&clientstream,
           "HELLO_RANDOM_STRING");
 }
-void playcomplete (int error )
+void PlayComplete (int error )
 {
     OutputDebugStringA("Playback Completed\n");
 }
@@ -55,7 +55,7 @@
     DWORD dwID;
     HANDLE audiothread = NULL;
     char input='\0';
-    printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n");
+    OutputDebugStringA("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n");
     //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf("");
 
     /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/
@@ -71,19 +71,19 @@
 
     if ( error )
     {
-        printf("Failed to Initialize Stream.Error %d\n", error);
+        OutputDebugStringA("Failed to Initialize Stream.Error \n");
         goto error;
     }
     else
     {
-        printf("StreamID : %ld\n",clientstream.stream);
+        OutputDebugStringA("StreamID : %ld\n",clientstream.stream);
         audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID);
     }
 
     while ( input != 'a' )
         scanf("%c",&input);
 
-    printf("Stoping Audio Stream.\n");
+    OutputDebugStringA("Stoping Audio Stream.\n");
     stopaudio(&clientstream);
     WaitForSingleObject(audiothread,INFINITE);