diff options
| author | Chris Robinson <[email protected]> | 2023-06-05 19:42:34 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2023-06-05 19:42:34 -0700 |
| commit | 5c143f8faa791cf563b2e7d11139c0f41bcb6cbc (patch) | |
| tree | 6fa58ae60a852b70dc8bf8f7a0b7b3b35f140cd0 | |
| parent | 399853fa3456fa1cf21426f0a2f8f39390124c64 (diff) | |
Avoid explicit definitions of some IIDs
| -rw-r--r-- | alc/backends/wasapi.cpp | 6 | ||||
| -rw-r--r-- | core/uiddefs.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp index 653c9098..b07cb62a 100644 --- a/alc/backends/wasapi.cpp +++ b/alc/backends/wasapi.cpp @@ -423,7 +423,7 @@ struct DeviceHelper final : private IMMNotificationClient { #if !defined(ALSOFT_UWP) HRESULT hr{CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_INPROC_SERVER, - IID_IMMDeviceEnumerator, al::out_ptr(mEnumerator))}; + __uuidof(IMMDeviceEnumerator), al::out_ptr(mEnumerator))}; if(SUCCEEDED(hr)) mEnumerator->RegisterEndpointNotificationCallback(this); else @@ -1621,7 +1621,7 @@ HRESULT WasapiPlayback::startProxy() return hr; } - hr = mClient->GetService(IID_IAudioRenderClient, al::out_ptr(mRender)); + hr = mClient->GetService(__uuidof(IAudioRenderClient), al::out_ptr(mRender)); if(SUCCEEDED(hr)) { try { @@ -2201,7 +2201,7 @@ HRESULT WasapiCapture::startProxy() return hr; } - hr = mClient->GetService(IID_IAudioCaptureClient, al::out_ptr(mCapture)); + hr = mClient->GetService(__uuidof(IAudioCaptureClient), al::out_ptr(mCapture)); if(SUCCEEDED(hr)) { try { diff --git a/core/uiddefs.cpp b/core/uiddefs.cpp index 833150f5..9471bba5 100644 --- a/core/uiddefs.cpp +++ b/core/uiddefs.cpp @@ -19,10 +19,6 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80,0x DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf,0x08, 0x00,0xa0,0xc9,0x25,0xcd,0x16); 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); -DEFINE_GUID(IID_IAudioCaptureClient, 0xc8adbd64, 0xe71e, 0x48a0, 0xa4,0xde, 0x18,0x5c,0x39,0x5c,0xd3,0x17); #if defined(HAVE_WASAPI) && !defined(ALSOFT_UWP) #include <wtypes.h> |