[MMIXER]

* Do not include debug.h into the main header.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61513

diff --git a/reactos/lib/drivers/sound/mmixer/controls.c b/reactos/lib/drivers/sound/mmixer/controls.c
index 51cb250..e1315e5 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/controls.c
+++ b/reactos/lib/drivers/sound/mmixer/controls.c
@@ -8,6 +8,9 @@
  
 #include "priv.h"
 
+#define YDEBUG
+#include <debug.h>
+
 const GUID KSNODETYPE_DESKTOP_MICROPHONE = {0xDFF21BE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}};
 const GUID KSNODETYPE_LEGACY_AUDIO_CONNECTOR = {0xDFF21FE4, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}};
 const GUID KSNODETYPE_TELEPHONE = {0xDFF21EE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}};

diff --git a/reactos/lib/drivers/sound/mmixer/filter.c b/reactos/lib/drivers/sound/mmixer/filter.c
index 9a2739e..41ae60b 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/filter.c
+++ b/reactos/lib/drivers/sound/mmixer/filter.c
@@ -6,10 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
-
 #include "priv.h"
 
+#define YDEBUG
+#include <debug.h>
+
 ULONG
 MMixerGetFilterPinCount(
     IN PMIXER_CONTEXT MixerContext,

diff --git a/reactos/lib/drivers/sound/mmixer/midi.c b/reactos/lib/drivers/sound/mmixer/midi.c
index a6f5d65..c80bdb5 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/midi.c
+++ b/reactos/lib/drivers/sound/mmixer/midi.c
@@ -8,6 +8,9 @@
 
 #include "priv.h"
 
+#define YDEBUG
+#include <debug.h>
+
 MIXER_STATUS
 MMixerGetPinDataFlowAndCommunication(
     IN PMIXER_CONTEXT MixerContext,

diff --git a/reactos/lib/drivers/sound/mmixer/mixer.c b/reactos/lib/drivers/sound/mmixer/mixer.c
index 980a49e..dbb614f 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/mixer.c
+++ b/reactos/lib/drivers/sound/mmixer/mixer.c
@@ -6,10 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
-
 #include "priv.h"
 
+#define YDEBUG
+#include <debug.h>
+
 ULONG
 MMixerGetCount(
     IN PMIXER_CONTEXT MixerContext)

diff --git a/reactos/lib/drivers/sound/mmixer/priv.h b/reactos/lib/drivers/sound/mmixer/priv.h
index 9cfab6e..4a49271 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/priv.h
+++ b/reactos/lib/drivers/sound/mmixer/priv.h
@@ -1,20 +1,12 @@
-#include <pseh/pseh2.h>
 #include <ntddk.h>
-
 #include <windef.h>
 #define NOBITMAP
 #include <mmreg.h>
-#include <ks.h>
 #include <ksmedia.h>
-#include <mmreg.h>
 #include <mmsystem.h>
 
 #include "mmixer.h"
 
-#include <stdio.h>
-#define YDEBUG
-#include <debug.h>
-
 typedef struct __TOPOLOGY_NODE__
 {
     GUID NodeType;

diff --git a/reactos/lib/drivers/sound/mmixer/sup.c b/reactos/lib/drivers/sound/mmixer/sup.c
index 6d83e2c..1515942 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/sup.c
+++ b/reactos/lib/drivers/sound/mmixer/sup.c
@@ -6,10 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
-
 #include "priv.h"
 
+#define YDEBUG
+#include <debug.h>
+
 const GUID KSNODETYPE_SUM = {0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}};
 const GUID KSNODETYPE_DAC = {0x507AE360L, 0xC554, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}};
 const GUID KSNODETYPE_ADC = {0x4D837FE0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}};

diff --git a/reactos/lib/drivers/sound/mmixer/topology.c b/reactos/lib/drivers/sound/mmixer/topology.c
index df614cf..6bc4c17 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/topology.c
+++ b/reactos/lib/drivers/sound/mmixer/topology.c
@@ -8,6 +8,9 @@
 
 #include "priv.h"
 
+#define YDEBUG
+#include <debug.h>
+
 VOID
 MMixerPrintTopology(
     PTOPOLOGY Topology)

diff --git a/reactos/lib/drivers/sound/mmixer/wave.c b/reactos/lib/drivers/sound/mmixer/wave.c
index 1d39f37..4c32485 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/wave.c
+++ b/reactos/lib/drivers/sound/mmixer/wave.c
@@ -8,6 +8,9 @@
 
 #include "priv.h"
 
+#define YDEBUG
+#include <debug.h>
+
 const GUID KSPROPSETID_Connection               = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
 const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX  = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}};
 const GUID KSDATAFORMAT_SUBTYPE_PCM             = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};