Sync with trunk (r49303)

svn path=/branches/cmake-bringup/; revision=49307
This commit is contained in:
Jérôme Gardou 2010-10-27 15:52:24 +00:00
commit b2f64ac552
157 changed files with 10003 additions and 9064 deletions

View file

@ -1005,11 +1005,6 @@ DEFINE_GUIDSTRUCT("97E99BA0-BDEA-11CF-A5D6-28DB04C10000", KSPROPTYPESETID_Genera
KSPROPERTY_DIRECTSOUND3DLISTENER_VELOCITY
*/
#define KSPROPSETID_DrmAudioStream
/*
KSPROPERTY_DRMAUDIOSTREAM_CONTENTID
*/
#define KSPROPSETID_Hrtf3d
/*
KSPROPERTY_HRTF3D_FILTER_FORMAT

View file

@ -565,6 +565,15 @@ typedef struct {
#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