diff options
| author | Chris Robinson <[email protected]> | 2011-05-22 13:29:32 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2011-05-22 13:29:32 -0700 |
| commit | d83af679bd648d1a24b9643a384f98bcf34583c5 (patch) | |
| tree | 17a5d45ad4771808965d3e96fd77ac532d66c4b0 /Alc | |
| parent | af005668daa679665b6eb0957a87ed3a0cbed3f0 (diff) | |
Fix handling of GUID definitions
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/ALc.c | 34 |
1 files changed, 14 insertions, 20 deletions
@@ -20,29 +20,23 @@ #include "config.h" -#ifndef HAVE_LIBUUID -#ifdef HAVE_MMDEVAPI +#if defined(HAVE_GUIDDEF_H) || defined(HAVE_INITGUID_H) #define INITGUID -#include <mmdeviceapi.h> -#include <audioclient.h> -#include <cguid.h> -#include <mmreg.h> -#ifndef _WAVEFORMATEXTENSIBLE_ -#include <ks.h> -#include <ksmedia.h> -#endif +#include <windows.h> +#ifdef HAVE_GUIDDEF_H +#include <guiddef.h> +#else +#include <initguid.h> #endif -#ifdef HAVE_DSOUND -#define INITGUID -#include <dsound.h> -#include <cguid.h> -#include <mmreg.h> -#ifndef _WAVEFORMATEXTENSIBLE_ -#include <ks.h> -#include <ksmedia.h> -#endif -#endif +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +DEFINE_GUID(CLSID_MMDeviceEnumerator, 0xbcde0395, 0xe52f, 0x467c, 0x8e,0x3d, 0xc4,0x57,0x92,0x91,0x69,0x2e); +DEFINE_GUID(IID_IMMDeviceEnumerator, 0xa95664d2, 0x9614, 0x4f35, 0xa7,0x46, 0xde,0x8d,0xb6,0x36,0x17,0xe6); +DEFINE_GUID(IID_IAudioClient, 0x1cb9ad4c, 0xdbfa, 0x4c32, 0xb1,0x78, 0xc2,0xf5,0x68,0xa7,0x03,0xb2); +DEFINE_GUID(IID_IAudioRenderClient, 0xf294acfc, 0x3146, 0x4483, 0xa7,0xbf, 0xad,0xdc,0xa7,0xc2,0x60,0xe2); + #endif #include <math.h> |