Fixed build by including the correct header this time!
authorAndrew Greenwood <silverblade@reactos.org>
Sun, 15 Feb 2009 15:37:44 +0000 (15:37 +0000)
committerAndrew Greenwood <silverblade@reactos.org>
Sun, 15 Feb 2009 15:37:44 +0000 (15:37 +0000)
Renamed SubmitWaveHeader to EnqueueWaveHeader, except for in the functiontable
which will actually do the wave header submission to the driver.

svn path=/trunk/; revision=39609

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

index 99c5894..b192388 100644 (file)
@@ -307,8 +307,8 @@ MmeCloseDevice(
 #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 @@ UnprepareWaveHeader(
     IN  PWAVEHDR Header);
 
 MMRESULT
-SubmitWaveHeader(
+EnqueueWaveHeader(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
     IN  PWAVEHDR Header);
 
index 054e3c7..7cf01eb 100644 (file)
@@ -131,7 +131,7 @@ UnprepareWaveHeader(
 }
 
 MMRESULT
-SubmitWaveHeader(
+EnqueueWaveHeader(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
     IN  PWAVEHDR Header)
 {
index 60df66a..754b8c3 100644 (file)
@@ -94,7 +94,7 @@ wodMessage(
 
         case WODM_WRITE :
         {
-            Result = MmeSubmitWaveHeader(PrivateHandle, Parameter1);
+            Result = MmeEnqueueWaveHeader(PrivateHandle, Parameter1);
             break;
         }
 
index 94c2b08..6289187 100644 (file)
@@ -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 @@ SetNt4WaveDeviceFormat(
     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