diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-02-14 11:56:45 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-02-26 16:23:11 +0530 |
| commit | 16af66ee952804c2ddfb6ed719ea48f3092f6d9f (patch) | |
| tree | c86720eef0ed6dfd583d885ed190837095de68b1 | |
| parent | 28874e15ff286a1486ea4f6fc2aadfe70556db0b (diff) | |
wasapi: __uuidof is simply not available in C
Fix comment, and don't try to use it at all.
| -rw-r--r-- | sys/wasapi/gstwasapiutil.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/wasapi/gstwasapiutil.c b/sys/wasapi/gstwasapiutil.c index 986d2e37d..fa0f19f3b 100644 --- a/sys/wasapi/gstwasapiutil.c +++ b/sys/wasapi/gstwasapiutil.c @@ -40,18 +40,8 @@ DEFINE_PROPERTYKEY (PKEY_AudioEngine_DeviceFormat, 0xf19f064d, 0x82c, 0x4e27, 0xbc, 0x73, 0x68, 0x82, 0xa1, 0xbb, 0x8e, 0x4c, 0); #endif - -#ifdef __uuidof -const CLSID CLSID_MMDeviceEnumerator = __uuidof (MMDeviceEnumerator); -const IID IID_IMMDeviceEnumerator = __uuidof (IMMDeviceEnumerator); -const IID IID_IMMEndpoint = __uuidof (IMMEndpoint); -const IID IID_IAudioClient = __uuidof (IAudioClient); -const IID IID_IAudioRenderClient = __uuidof (IAudioRenderClient); -const IID IID_IAudioCaptureClient = __uuidof (IAudioCaptureClient); -const IID IID_IAudioClock = __uuidof (IAudioClock); -#else -/* __uuidof is not implemented in our Cerbero's ancient MinGW toolchain so we - * hard-code the GUID values for all these. This is ok because these are ABI. */ +/* __uuidof is only available in C++, so we hard-code the GUID values for all + * these. This is ok because these are ABI. */ const CLSID CLSID_MMDeviceEnumerator = { 0xbcde0395, 0xe52f, 0x467c, {0x8e, 0x3d, 0xc4, 0x57, 0x92, 0x91, 0x69, 0x2e} }; @@ -79,7 +69,6 @@ const IID IID_IAudioCaptureClient = { 0xc8adbd64, 0xe71e, 0x48a0, const IID IID_IAudioRenderClient = { 0xf294acfc, 0x3146, 0x4483, {0xa7, 0xbf, 0xad, 0xdc, 0xa7, 0xc2, 0x60, 0xe2} }; -#endif static struct { |