diff --git a/src/platform/windows/audio.cpp b/src/platform/windows/audio.cpp index eac55e89..1f794e24 100644 --- a/src/platform/windows/audio.cpp +++ b/src/platform/windows/audio.cpp @@ -2,6 +2,7 @@ * @file src/platform/windows/audio.cpp * @brief todo */ +#define INITGUID #include #include #include @@ -12,10 +13,6 @@ #include -#define INITGUID -#include -#undef INITGUID - #include "src/config.h" #include "src/main.h" #include "src/platform/common.h" @@ -29,11 +26,6 @@ DEFINE_PROPERTYKEY(PKEY_Device_DeviceDesc, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x2 DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); // DEVPROP_TYPE_STRING DEFINE_PROPERTYKEY(PKEY_DeviceInterface_FriendlyName, 0x026e516e, 0xb814, 0x414b, 0x83, 0xcd, 0x85, 0x6d, 0x6f, 0xef, 0x48, 0x22, 2); -const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator); -const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator); -const IID IID_IAudioClient = __uuidof(IAudioClient); -const IID IID_IAudioCaptureClient = __uuidof(IAudioCaptureClient); - #if defined(__x86_64) || defined(_M_AMD64) #define STEAM_DRIVER_SUBDIR L"x64" #elif defined(__i386) || defined(_M_IX86) diff --git a/tools/audio.cpp b/tools/audio.cpp index 0d05df5e..81894382 100644 --- a/tools/audio.cpp +++ b/tools/audio.cpp @@ -2,6 +2,7 @@ * @file tools/audio.cpp * @brief todo */ +#define INITGUID #include #include #include @@ -11,10 +12,6 @@ #include -#define INITGUID -#include -#undef INITGUID - #include #include "src/utility.h" @@ -24,10 +21,6 @@ DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0 DEFINE_PROPERTYKEY(PKEY_DeviceInterface_FriendlyName, 0x026e516e, 0xb814, 0x414b, 0x83, 0xcd, 0x85, 0x6d, 0x6f, 0xef, 0x48, 0x22, 2); using namespace std::literals; -const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator); -const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator); -const IID IID_IAudioClient = __uuidof(IAudioClient); -const IID IID_IAudioCaptureClient = __uuidof(IAudioCaptureClient); int device_state_filter = DEVICE_STATE_ACTIVE;