Author: janderwald
Date: Fri Feb 20 08:50:26 2009
New Revision: 39693
URL:
http://svn.reactos.org/svn/reactos?rev=39693&view=rev
Log:
- Fix property sets for sysaudio
Modified:
trunk/reactos/include/psdk/ks.h
trunk/reactos/include/psdk/ksmedia.h
Modified: trunk/reactos/include/psdk/ks.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3969…
==============================================================================
--- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Fri Feb 20 08:50:26 2009
@@ -378,8 +378,11 @@
Properties/Methods/Events
*/
-#define KSPROPSETID_General \
- 0x1464EDA5L, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96
+#define STATIC_KSPROPSETID_General\
+ 0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
+DEFINE_GUIDSTRUCT("1464EDA5-6A8F-11D1-9AA7-00A0C9223196",
KSPROPSETID_General);
+#define KSPROPSETID_General DEFINE_GUIDNAMED(KSPROPSETID_General)
+
typedef enum
{
@@ -728,23 +731,6 @@
KSPROPERTY_SYNTH_DLS_WAVEFORMAT
*/
-/* #define KSPROPSETID_Sysaudio */
-/*
- KSPROPERTY_SYSAUDIO_COMPONENT_ID
- KSPROPERTY_SYSAUDIO_CREATE_VIRTUAL_SOURCE
- KSPROPERTY_SYSAUDIO_DEVICE_COUNT
- KSPROPERTY_SYSAUDIO_DEVICE_FRIENDLY_NAME
- KSPROPERTY_SYSAUDIO_DEVICE_INSTANCE
- KSPROPERTY_SYSAUDIO_DEVICE_INTERFACE_NAME
- KSPROPERTY_SYSAUDIO_INSTANCE_INFO
- KSPROPERTY_SYSAUDIO_SELECT_GRAPH
-*/
-
-#define KSPROPSETID_Sysaudio_Pin
-/*
- KSPROPERTY_SYSAUDIO_ATTACH_VIRTUAL_SOURCE
-*/
-
#define KSPROPSETID_TopologyNode
/*
KSPROPERTY_TOPOLOGYNODE_ENABLE
Modified: trunk/reactos/include/psdk/ksmedia.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Fri Feb 20 08:50:26 2009
@@ -213,4 +213,14 @@
#define SYSAUDIO_FLAGS_DONT_COMBINE_PINS 0x00000001
+#define STATIC_KSPROPSETID_Sysaudio_Pin \
+ 0xA3A53220L, 0xC6E4, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}
+DEFINE_GUIDSTRUCT("A3A53220-C6E4-11D0-B465-00001A1818E6",
KSPROPSETID_Sysaudio_Pin);
+#define KSPROPSETID_Sysaudio_Pin DEFINE_GUIDNAMED(KSPROPSETID_Sysaudio_Pin)
+
+typedef enum {
+ KSPROPERTY_SYSAUDIO_ATTACH_VIRTUAL_SOURCE = 1,
+} KSPROPERTY_SYSAUDIO_PIN;
+
+
#endif