Author: nyadav
Date: Mon Apr 4 13:21:25 2011
New Revision: 51251
URL: http://svn.reactos.org/svn/reactos?rev=51251&view=rev
Log:
Fix headers for audio_test
Modified:
branches/nyadav-audio-branch/include/psdk/ksmedia.h
Modified: branches/nyadav-audio-branch/include/psdk/ksmedia.h
URL:
http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/psdk/ksmedia.h?rev=51251&r1=51250&r2=51251&view=diff
==============================================================================
--- branches/nyadav-audio-branch/include/psdk/ksmedia.h [iso-8859-1] (original)
+++ branches/nyadav-audio-branch/include/psdk/ksmedia.h [iso-8859-1] Mon Apr 4
13:21:25 2011
@@ -347,6 +347,25 @@
KSDATAFORMAT DataFormat;
WAVEFORMATEX WaveFormatEx;
} KSDATAFORMAT_WAVEFORMATEX, *PKSDATAFORMAT_WAVEFORMATEX;
+
+#ifndef _WAVEFORMATEXTENSIBLE_
+#define _WAVEFORMATEXTENSIBLE_
+typedef struct {
+ WAVEFORMATEX Format;
+ union
+ {
+ WORD wValidBitsPerSample;
+ WORD wSamplesPerBlock;
+ WORD wReserved;
+ }Samples;
+ DWORD dwChannelMask;
+ GUID SubFormat;
+} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
+#endif
+
+#if !defined(WAVE_FORMAT_EXTENSIBLE)
+#define WAVE_FORMAT_EXTENSIBLE 0xFFFE
+#endif
typedef struct {
ULONG Flags;
@@ -734,4 +753,50 @@
ULONG ChannelMask;
} KSDATARANGE_MUSIC, *PKSDATARANGE_MUSIC;
-#endif
+#ifndef _SPEAKER_POSITIONS_
+#define _SPEAKER_POSITIONS_
+
+
+#define SPEAKER_FRONT_LEFT 0x1
+#define SPEAKER_FRONT_RIGHT 0x2
+#define SPEAKER_FRONT_CENTER 0x4
+#define SPEAKER_LOW_FREQUENCY 0x8
+#define SPEAKER_BACK_LEFT 0x10
+#define SPEAKER_BACK_RIGHT 0x20
+#define SPEAKER_FRONT_LEFT_OF_CENTER 0x40
+#define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80
+#define SPEAKER_BACK_CENTER 0x100
+#define SPEAKER_SIDE_LEFT 0x200
+#define SPEAKER_SIDE_RIGHT 0x400
+#define SPEAKER_TOP_CENTER 0x800
+#define SPEAKER_TOP_FRONT_LEFT 0x1000
+#define SPEAKER_TOP_FRONT_CENTER 0x2000
+#define SPEAKER_TOP_FRONT_RIGHT 0x4000
+#define SPEAKER_TOP_BACK_LEFT 0x8000
+#define SPEAKER_TOP_BACK_CENTER 0x10000
+#define SPEAKER_TOP_BACK_RIGHT 0x20000
+
+#define SPEAKER_RESERVED 0x7FFC0000
+#define SPEAKER_ALL 0x80000000
+
+#endif
+
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+#define KSAUDIO_SPEAKER_DIRECTOUT 0
+#endif
+
+#define KSAUDIO_SPEAKER_MONO (SPEAKER_FRONT_CENTER)
+#define KSAUDIO_SPEAKER_STEREO (SPEAKER_FRONT_LEFT |
SPEAKER_FRONT_RIGHT)
+#define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT |
SPEAKER_FRONT_RIGHT | \
+ SPEAKER_BACK_LEFT |
SPEAKER_BACK_RIGHT)
+#define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT |
SPEAKER_FRONT_RIGHT | \
+ SPEAKER_FRONT_CENTER |
SPEAKER_BACK_CENTER)
+#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT |
SPEAKER_FRONT_RIGHT | \
+ SPEAKER_FRONT_CENTER |
SPEAKER_LOW_FREQUENCY | \
+ SPEAKER_BACK_LEFT |
SPEAKER_BACK_RIGHT)
+#define KSAUDIO_SPEAKER_7POINT1 (SPEAKER_FRONT_LEFT |
SPEAKER_FRONT_RIGHT | \
+ SPEAKER_FRONT_CENTER |
SPEAKER_LOW_FREQUENCY | \
+ SPEAKER_BACK_LEFT |
SPEAKER_BACK_RIGHT | \
+ SPEAKER_FRONT_LEFT_OF_CENTER |
SPEAKER_FRONT_RIGHT_OF_CENTER)
+
+#endif
