Author: nyadav Date: Thu Jun 9 18:12:07 2011 New Revision: 52160
URL: http://svn.reactos.org/svn/reactos?rev=52160&view=rev Log: [AUDSRV] Add File Headers,some style fixes
Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c
Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/service... ============================================================================== --- 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:12:07 2011 @@ -424,14 +424,17 @@
SetEvent(mixer->played);
- while(1) + while(TRUE) { while(WaitForSingleObject(mixer->played, 100)!=0) { if(mixer->dead) - goto DEAD; + break; } + + if(mixer->dead) + break;
mixandfill(mixer, 1-mixer->playcurrent); @@ -439,7 +442,6 @@ SetEvent(mixer->filled); }
-DEAD: return 0; }
@@ -454,8 +456,11 @@ 100)!=0) { if(mixer->dead) - goto DEAD; + break; } + + if(mixer->dead) + break;
SetEvent(mixer->played); playbuffer(mixer, @@ -466,7 +471,6 @@ mixer->playcurrent=1-mixer->playcurrent; }
-DEAD: return 0; }
Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/service... ============================================================================== --- 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:12:07 2011 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/mixer.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */
#include "audsrv.h" void * mixs8(MixerEngine * mixer,int buffer)
Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/service... ============================================================================== --- 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:12:07 2011 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/stream.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ + #include "audsrv.h"
long getnewstreamid()
Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/au... ============================================================================== --- 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:12:07 2011 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\audsrvapi\audsrvapi.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ + #include "audsrvapi.h"
/*All the wrappers for Remote Function should be here*/ @@ -57,14 +66,18 @@ /*This is an ActiveScheduler*/ clientstream->callbacks.OpenComplete(0);
- while(1) + while(TRUE) { while(WaitForSingleObject(clientstream->ClientEventPool[0], 100)!=0) { if(clientstream->dead) - goto DEAD; + break; } + + if(clientstream->dead) + break; + /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ Sleep(1000); @@ -74,7 +87,6 @@
DEAD: /*Audio Thread Ended*/ - return 0; }
Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/au... ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -1,2 +1,11 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\audsrvapi\audsrvapi.h + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ + #include "audsrvrpc_c.h" #include <audsrv/audsrvapi.h>
Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/au... ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\audsrvapi\dllmain.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */
#include "audsrvapi.h"
@@ -39,7 +47,8 @@ case DLL_THREAD_DETACH: case DLL_PROCESS_DETACH: status = RpcBindingFree(audsrv_v0_0_c_ifspec); - if (status == RPC_S_INVALID_BINDING) printf("Error : %d Invalid RPC S HANDLE\n",(int)status); + if (status == RPC_S_INVALID_BINDING) + OutputDebugStringA("Error Closing RPC Connection"); break; } return TRUE;
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/... ============================================================================== --- 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:12:07 2011 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/audsrv.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ + #define WIN32_NO_STATUS #define _KSDDK_
@@ -20,7 +29,7 @@ { ClientStream * localstream = (ClientStream *) param; playaudio(localstream); - + return 0; } void opencomplete (int error ) @@ -36,8 +45,7 @@ } void playcomplete (int error ) { - printf("Play Complete Code %d\n", - error); + OutputDebugStringA("Playback Completed\n"); } int __cdecl
-
nyadav＠svn.reactos.org