[ros-diffs] [silverblade] 39609: Fixed build by including the correct header this time! Renamed SubmitWaveHeader to EnqueueWaveHeader, except for in the functiontable which will actually do the wave header submission to the driver.

silverblade at svn.reactos.org silverblade at svn.reactos.org
Sun Feb 15 16:37:45 CET 2009


Author: silverblade
Date: Sun Feb 15 09:37:44 2009
New Revision: 39609

URL: http://svn.reactos.org/svn/reactos?rev=39609&view=rev
Log:
Fixed build by including the correct header this time!
Renamed SubmitWaveHeader to EnqueueWaveHeader, except for in the functiontable
which will actually do the wave header submission to the driver.


Modified:
    trunk/reactos/include/reactos/libs/sound/mmebuddy.h
    trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c
    trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
    trunk/reactos/lib/drivers/sound/mment4/control.c

Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound/mmebuddy.h?rev=39609&r1=39608&r2=39609&view=diff
==============================================================================
--- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Feb 15 09:37:44 2009
@@ -307,8 +307,8 @@
 #define MmeUnprepareWaveHeader(private_handle, header) \
     UnprepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header)
 
-#define MmeSubmitWaveHeader(private_handle, header) \
-    SubmitWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header)
+#define MmeEnqueueWaveHeader(private_handle, header) \
+    EnqueueWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header)
 
 
 /*
@@ -503,7 +503,7 @@
     IN  PWAVEHDR Header);
 
 MMRESULT
-SubmitWaveHeader(
+EnqueueWaveHeader(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
     IN  PWAVEHDR Header);
 

Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c?rev=39609&r1=39608&r2=39609&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Sun Feb 15 09:37:44 2009
@@ -131,7 +131,7 @@
 }
 
 MMRESULT
-SubmitWaveHeader(
+EnqueueWaveHeader(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
     IN  PWAVEHDR Header)
 {

Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c?rev=39609&r1=39608&r2=39609&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Feb 15 09:37:44 2009
@@ -94,7 +94,7 @@
 
         case WODM_WRITE :
         {
-            Result = MmeSubmitWaveHeader(PrivateHandle, Parameter1);
+            Result = MmeEnqueueWaveHeader(PrivateHandle, Parameter1);
             break;
         }
 

Modified: trunk/reactos/lib/drivers/sound/mment4/control.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/control.c?rev=39609&r1=39608&r2=39609&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] Sun Feb 15 09:37:44 2009
@@ -12,7 +12,7 @@
 #include <mmsystem.h>
 #include <mmddk.h>
 #include <ntddsnd.h>
-#include <reactos/sndtypes.h>
+#include <sndtypes.h>
 #include <mmebuddy.h>
 #include <mment4.h>
 
@@ -229,3 +229,17 @@
     return MMSYSERR_NOERROR;
 }
 
+#if 0
+MMRESULT
+SubmitNt4WaveHeader(
+    IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
+    IN  PWAVEHDR WaveHeader)
+{
+    VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance );
+    VALIDATE_MMSYS_PARAMETER( WaveHeader );
+
+    SND_TRACE(L"Submitting wave header %p (in sound thread)\n", WaveHeader);
+
+    /* TODO: This should only submit the header to the device, nothing more! */
+}
+#endif



More information about the Ros-diffs mailing list