From: Andrew Greenwood <silverblade@reactos.org>
Date: Sun, 15 Feb 2009 15:37:44 +0000 (+0000)
Subject: Fixed build by including the correct header this time!
X-Git-Tag: backups/danny-web@40415~24^2~470
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=c7273a56a629894581ca4f13415c3889afe67966

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.


svn path=/trunk/; revision=39609
---

diff --git a/reactos/include/reactos/libs/sound/mmebuddy.h b/reactos/include/reactos/libs/sound/mmebuddy.h
index 99c58945bdb..b1923886c25 100644
--- a/reactos/include/reactos/libs/sound/mmebuddy.h
+++ b/reactos/include/reactos/libs/sound/mmebuddy.h
@@ -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);
 
diff --git a/reactos/lib/drivers/sound/mmebuddy/wave/header.c b/reactos/lib/drivers/sound/mmebuddy/wave/header.c
index 054e3c71e7f..7cf01ebb9b6 100644
--- a/reactos/lib/drivers/sound/mmebuddy/wave/header.c
+++ b/reactos/lib/drivers/sound/mmebuddy/wave/header.c
@@ -131,7 +131,7 @@ UnprepareWaveHeader(
 }
 
 MMRESULT
-SubmitWaveHeader(
+EnqueueWaveHeader(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
     IN  PWAVEHDR Header)
 {
diff --git a/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c b/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
index 60df66ae83e..754b8c37324 100644
--- a/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
+++ b/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
@@ -94,7 +94,7 @@ wodMessage(
 
         case WODM_WRITE :
         {
-            Result = MmeSubmitWaveHeader(PrivateHandle, Parameter1);
+            Result = MmeEnqueueWaveHeader(PrivateHandle, Parameter1);
             break;
         }
 
diff --git a/reactos/lib/drivers/sound/mment4/control.c b/reactos/lib/drivers/sound/mment4/control.c
index 94c2b08c894..62891876094 100644
--- a/reactos/lib/drivers/sound/mment4/control.c
+++ b/reactos/lib/drivers/sound/mment4/control.c
@@ -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