6 Nov
2010
6 Nov
'10
12:10 p.m.
Author: janderwald
Date: Sat Nov 6 12:10:50 2010
New Revision: 49511
URL: http://svn.reactos.org/svn/reactos?rev=49511&view=rev
Log:
- merge audio headers
Added:
branches/audio-bringup/include/ddk/dmusprop.h
- copied unchanged from r49509, trunk/reactos/include/ddk/dmusprop.h
Modified:
branches/audio-bringup/include/ (props changed)
branches/audio-bringup/include/ddk/dmusicks.h
branches/audio-bringup/include/ddk/portcls.h
branches/audio-bringup/include/psdk/ks.h
branches/audio-bringup/include/psdk/ksmedia.h
branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h
Propchange: branches/audio-bringup/include/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 6 12:10:50 2010
@@ -1,0 +1,5 @@
+/branches/header-work/include:45691-47721
+/branches/reactos-yarotows/include:46372,46848,46966,47800,48026,48064
+/branches/ros-amd64-bringup/include:36852
+/branches/ros-amd64-bringup/reactos/include:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
+/trunk/reactos/include:49194-49509
Modified: branches/audio-bringup/include/ddk/dmusicks.h
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/ddk/dmusi…
==============================================================================
--- branches/audio-bringup/include/ddk/dmusicks.h [iso-8859-1] (original)
+++ branches/audio-bringup/include/ddk/dmusicks.h [iso-8859-1] Sat Nov 6 12:10:50 2010
@@ -1,5 +1,7 @@
#ifndef _DMUSICKS_
#define _DMUSICKS_
+
+#include <dmusprop.h>
#define DONT_HOLD_FOR_SEQUENCING 0x8000000000000000
@@ -230,4 +232,35 @@
IN PMASTERCLOCK MasterClock, \
OUT PULONGLONG SchedulePreFetch)
+
+#define STATIC_KSAUDFNAME_DMUSIC_MPU_OUT\
+ 0xA4DF0EB5, 0xBAC9, 0x11d2, {0xB7, 0xA8, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1}
+DEFINE_GUIDSTRUCT("A4DF0EB5-BAC9-11d2-B7A8-0060083316C1",
KSAUDFNAME_DMUSIC_MPU_OUT);
+#define KSAUDFNAME_DMUSIC_MPU_OUT DEFINE_GUIDNAMED(KSAUDFNAME_DMUSIC_MPU_OUT)
+
+#define STATIC_KSAUDFNAME_DMUSIC_MPU_IN\
+ 0xB2EC0A7D, 0xBAC9, 0x11d2, {0xB7, 0xA8, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1}
+DEFINE_GUIDSTRUCT("B2EC0A7D-BAC9-11d2-B7A8-0060083316C1",
KSAUDFNAME_DMUSIC_MPU_IN);
+#define KSAUDFNAME_DMUSIC_MPU_IN DEFINE_GUIDNAMED(KSAUDFNAME_DMUSIC_MPU_IN)
+
+#define STATIC_IID_IMXF\
+ 0xc096df9e, 0xfb09, 0x11d1, {0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}
+DEFINE_GUIDSTRUCT("c096df9e-fb09-11d1-81b0-0060083316c1", IID_IMXF);
+#define IID_IMXF DEFINE_GUIDNAMED(IID_IMXF)
+
+#define DMUS_KEF_EVENT_COMPLETE 0x0000
+#define DMUS_KEF_EVENT_INCOMPLETE 0x0001
+#define DMUS_KEF_PACKAGE_EVENT 0x0002
+#define kBytePositionNone (~(ULONGLONG)0)
+
+#define SHORT_EVT(evt) ((evt)->cbEvent <= sizeof(PBYTE))
+#define PACKAGE_EVT(evt) ((evt)->usFlags & DMUS_KEF_PACKAGE_EVENT)
+#define INCOMPLETE_EVT(evt) ((evt)->usFlags & DMUS_KEF_EVENT_INCOMPLETE)
+#define COMPLETE_EVT(evt) (((evt)->usFlags & DMUS_KEF_EVENT_INCOMPLETE) == 0)
+
+#define SET_INCOMPLETE_EVT(evt) ((evt)->usFlags |= DMUS_KEF_EVENT_INCOMPLETE)
+#define SET_COMPLETE_EVT(evt) ((evt)->usFlags &= (~DMUS_KEF_EVENT_INCOMPLETE))
+#define SET_PACKAGE_EVT(evt) ((evt)->usFlags |= DMUS_KEF_PACKAGE_EVENT)
+#define CLEAR_PACKAGE_EVT(evt) ((evt)->usFlags &= (~DMUS_KEF_PACKAGE_EVENT))
+
#endif /* _DMUSICKS_ */
Modified: branches/audio-bringup/include/ddk/portcls.h
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/ddk/portc…
==============================================================================
--- branches/audio-bringup/include/ddk/portcls.h [iso-8859-1] (original)
+++ branches/audio-bringup/include/ddk/portcls.h [iso-8859-1] Sat Nov 6 12:10:50 2010
@@ -1958,6 +1958,12 @@
typedef IPowerNotify *PPOWERNOTIFY;
+#define IMP_IPowerNotify\
+ STDMETHODIMP_(void) PowerChangeNotify\
+ ( IN POWER_STATE PowerState\
+ )
+
+
#undef INTERFACE
/* ===============================================================
@@ -2158,6 +2164,11 @@
#undef INTERFACE
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+DEFINE_GUID(IID_IMusicTechnology,
+0x80396C3CL, 0xCBCB, 0x409B, 0x9F, 0x65, 0x4F, 0x1E, 0x74, 0x67, 0xCD, 0xAF);
+#endif
+
/* ===============================================================
IDmaOperations Interface
*/
@@ -2364,6 +2375,10 @@
PcGetTimeInterval(
IN ULONGLONG Since);
+#define GTI_SECONDS(t) (ULONGLONG(t)*10000000)
+#define GTI_MILLISECONDS(t) (ULONGLONG(t)*10000)
+#define GTI_MICROSECONDS(t) (ULONGLONG(t)*10)
+
PORTCLASSAPI NTSTATUS NTAPI
PcRegisterSubdevice(
IN PDEVICE_OBJECT DeviceObject,
Modified: branches/audio-bringup/include/psdk/ks.h
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/psdk/ks.h…
==============================================================================
--- branches/audio-bringup/include/psdk/ks.h [iso-8859-1] (original)
+++ branches/audio-bringup/include/psdk/ks.h [iso-8859-1] Sat Nov 6 12:10:50 2010
@@ -1005,11 +1005,6 @@
KSPROPERTY_DIRECTSOUND3DLISTENER_VELOCITY
*/
-#define KSPROPSETID_DrmAudioStream
-/*
- KSPROPERTY_DRMAUDIOSTREAM_CONTENTID
-*/
-
#define KSPROPSETID_Hrtf3d
/*
KSPROPERTY_HRTF3D_FILTER_FORMAT
@@ -1020,28 +1015,6 @@
#define KSPROPSETID_Itd3d
/*
KSPROPERTY_ITD3D_PARAMS
-*/
-
-#define KSPROPSETID_Synth
-/*
- KSPROPERTY_SYNTH_CAPS
- KSPROPERTY_SYNTH_CHANNELGROUPS
- KSPROPERTY_SYNTH_LATENCYCLOCK
- KSPROPERTY_SYNTH_MASTERCLOCK
- KSPROPERTY_SYNTH_PORTPARAMETERS
- KSPROPERTY_SYNTH_RUNNINGSTATS
- KSPROPERTY_SYNTH_VOICEPRIORITY
- KSPROPERTY_SYNTH_VOLUME
- KSPROPERTY_SYNTH_VOLUMEBOOST
-*/
-
-#define KSPROPSETID_Synth_Dls
-/*
- KSPROPERTY_SYNTH_DLS_APPEND
- KSPROPERTY_SYNTH_DLS_COMPACT
- KSPROPERTY_SYNTH_DLS_DOWNLOAD
- KSPROPERTY_SYNTH_DLS_UNLOAD
- KSPROPERTY_SYNTH_DLS_WAVEFORMAT
*/
#define KSPROPSETID_TopologyNode
Modified: branches/audio-bringup/include/psdk/ksmedia.h
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/psdk/ksme…
==============================================================================
--- branches/audio-bringup/include/psdk/ksmedia.h [iso-8859-1] (original)
+++ branches/audio-bringup/include/psdk/ksmedia.h [iso-8859-1] Sat Nov 6 12:10:50 2010
@@ -565,6 +565,15 @@
#endif // !_NTDDK_
} LOOPEDSTREAMING_POSITION_EVENT_DATA, *PLOOPEDSTREAMING_POSITION_EVENT_DATA ;
+#define STATIC_KSPROPSETID_DrmAudioStream\
+ 0x2f2c8ddd, 0x4198, 0x4fac, 0xba, 0x29, 0x61, 0xbb, 0x5, 0xb7, 0xde, 0x6
+DEFINE_GUIDSTRUCT("2F2C8DDD-4198-4fac-BA29-61BB05B7DE06",
KSPROPSETID_DrmAudioStream);
+#define KSPROPSETID_DrmAudioStream DEFINE_GUIDNAMED(KSPROPSETID_DrmAudioStream)
+
+typedef enum {
+ KSPROPERTY_DRMAUDIOSTREAM_CONTENTID
+} KSPROPERTY_DRMAUDIOSTREAM;
+
/*
SysAudio Properties
@@ -677,4 +686,52 @@
ULONG Accuracy;
} KSRTAUDIO_HWREGISTER, *PKSRTAUDIO_HWREGISTER;
+#define KSNODEPIN_STANDARD_IN 1
+#define KSNODEPIN_STANDARD_OUT 0
+
+#define KSNODEPIN_SUM_MUX_IN 1
+#define KSNODEPIN_SUM_MUX_OUT 0
+
+#define KSNODEPIN_DEMUX_IN 0
+#define KSNODEPIN_DEMUX_OUT 1
+
+#if (NTDDI_VERSION < NTDDI_VISTA)
+
+#define KSNODEPIN_AEC_RENDER_IN 1
+#define KSNODEPIN_AEC_RENDER_OUT 0
+#define KSNODEPIN_AEC_CAPTURE_IN 2
+#define KSNODEPIN_AEC_CAPTURE_OUT 3
+
#endif
+
+
+#define STATIC_KSMUSIC_TECHNOLOGY_PORT\
+ 0x86C92E60L, 0x62E8, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}
+DEFINE_GUIDSTRUCT("86C92E60-62E8-11CF-A5D6-28DB04C10000",
KSMUSIC_TECHNOLOGY_PORT);
+#define KSMUSIC_TECHNOLOGY_PORT DEFINE_GUIDNAMED(KSMUSIC_TECHNOLOGY_PORT)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MIDI_BUS\
+ 0x2CA15FA0L, 0x6CFE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}
+DEFINE_GUIDSTRUCT("2CA15FA0-6CFE-11CF-A5D6-28DB04C10000",
KSDATAFORMAT_SUBTYPE_MIDI_BUS);
+#define KSDATAFORMAT_SUBTYPE_MIDI_BUS DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MIDI_BUS)
+
+#define STATIC_KSAUDFNAME_MIDI\
+ 0x185FEDF8L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3
+DEFINE_GUIDSTRUCT("185FEDF8-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIDI);
+#define KSAUDFNAME_MIDI DEFINE_GUIDNAMED(KSAUDFNAME_MIDI)
+
+#define STATIC_KSNODETYPE_SYNTHESIZER\
+ DEFINE_USB_TERMINAL_GUID(0x0713)
+DEFINE_GUIDSTRUCT("DFF220F3-F70F-11D0-B917-00A0C9223196",
KSNODETYPE_SYNTHESIZER);
+#define KSNODETYPE_SYNTHESIZER DEFINE_GUIDNAMED(KSNODETYPE_SYNTHESIZER)
+
+typedef struct
+{
+ KSDATARANGE DataRange;
+ GUID Technology;
+ ULONG Channels;
+ ULONG Notes;
+ ULONG ChannelMask;
+} KSDATARANGE_MUSIC, *PKSDATARANGE_MUSIC;
+
+#endif
Modified: branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/reactos/l…
==============================================================================
--- branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original)
+++ branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sat Nov 6
12:10:50 2010
@@ -68,7 +68,7 @@
SND_TRACE(L"-- Current wave header list --\n"); \
while ( CurrDumpHdr ) \
{ \
- SND_TRACE(L"%x | %d bytes | flags: %x\n",
CurrDumpHdr->lpData, \
+ SND_TRACE(L"%x | %d bytes | flags: %x\n", CurrDumpHdr, \
CurrDumpHdr->dwBufferLength, \
CurrDumpHdr->dwFlags); \
CurrDumpHdr = CurrDumpHdr->lpNext; \
@@ -364,6 +364,8 @@
WAVEFORMATEX WaveFormatEx;
HANDLE hNotifyEvent;
HANDLE hStopEvent;
+ HANDLE hResetEvent;
+ BOOL ResetInProgress;
} SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE;
/* This lives in WAVEHDR.reserved */
@@ -411,7 +413,7 @@
IN DWORD CapabilitiesSize);
MMRESULT
-MmeOpenWaveDevice(
+MmeOpenDevice(
IN MMDEVICE_TYPE DeviceType,
IN UINT DeviceId,
IN LPWAVEOPENDESC OpenParameters,