@@ -92,15 +92,15 @@ __CRT_UUID_DECL(IAudioClient3, 0x7ED4EE07, 0x8E67, 0x4CD4, 0x8C, 0x1A, 0x2B, 0x7
92
92
93
93
#endif // __MINGW32__ || __MINGW64__
94
94
95
- #ifndef PKEY_Device_FriendlyName
95
+ #ifndef PKEY_Device_FriendlyNameGodot
96
96
97
97
#undef DEFINE_PROPERTYKEY
98
98
/* clang-format off */
99
99
#define DEFINE_PROPERTYKEY (id, a, b, c, d, e, f, g, h, i, j, k, l ) \
100
100
const PROPERTYKEY id = { { a, b, c, { d, e, f, g, h, i, j, k, } }, l };
101
101
/* clang-format on */
102
102
103
- DEFINE_PROPERTYKEY (PKEY_Device_FriendlyName , 0xa45c254e , 0xdf1c , 0x4efd , 0x80 , 0x20 , 0x67 , 0xd1 , 0x46 , 0xa8 , 0x50 , 0xe0 , 14 );
103
+ DEFINE_PROPERTYKEY (PKEY_Device_FriendlyNameGodot , 0xa45c254e , 0xdf1c , 0x4efd , 0x80 , 0x20 , 0x67 , 0xd1 , 0x46 , 0xa8 , 0x50 , 0xe0 , 14 );
104
104
#endif
105
105
106
106
const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
@@ -234,7 +234,7 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_i
234
234
PROPVARIANT propvar;
235
235
PropVariantInit (&propvar);
236
236
237
- hr = props->GetValue (PKEY_Device_FriendlyName , &propvar);
237
+ hr = props->GetValue (PKEY_Device_FriendlyNameGodot , &propvar);
238
238
ERR_BREAK (hr != S_OK);
239
239
240
240
if (p_device->device_name == String (propvar.pwszVal )) {
@@ -597,7 +597,7 @@ PackedStringArray AudioDriverWASAPI::audio_device_get_list(bool p_input) {
597
597
PROPVARIANT propvar;
598
598
PropVariantInit (&propvar);
599
599
600
- hr = props->GetValue (PKEY_Device_FriendlyName , &propvar);
600
+ hr = props->GetValue (PKEY_Device_FriendlyNameGodot , &propvar);
601
601
ERR_BREAK (hr != S_OK);
602
602
603
603
list.push_back (String (propvar.pwszVal ));
0 commit comments