Browse Source

[Windows] Rename `PKEY_Device_FriendlyName` to avoid duplicate symbols with newer MinGW SDKs.

(cherry picked from commit c363e130519281d9bdaf421d9ba84ad33564d38d)
Pāvels Nadtočajevs 9 months ago
parent
commit
30cb6ec66e
1 changed files with 4 additions and 4 deletions
  1. 4 4
      drivers/wasapi/audio_driver_wasapi.cpp

+ 4 - 4
drivers/wasapi/audio_driver_wasapi.cpp

@@ -37,7 +37,7 @@
 
 
 #include <functiondiscoverykeys.h>
 #include <functiondiscoverykeys.h>
 
 
-#ifndef PKEY_Device_FriendlyName
+#ifndef PKEY_Device_FriendlyNameGodot
 
 
 #undef DEFINE_PROPERTYKEY
 #undef DEFINE_PROPERTYKEY
 /* clang-format off */
 /* clang-format off */
@@ -45,7 +45,7 @@
 	const PROPERTYKEY id = { { a, b, c, { d, e, f, g, h, i, j, k, } }, l };
 	const PROPERTYKEY id = { { a, b, c, { d, e, f, g, h, i, j, k, } }, l };
 /* clang-format on */
 /* clang-format on */
 
 
-DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);
+DEFINE_PROPERTYKEY(PKEY_Device_FriendlyNameGodot, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);
 #endif
 #endif
 
 
 const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
 const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
@@ -178,7 +178,7 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
 			PROPVARIANT propvar;
 			PROPVARIANT propvar;
 			PropVariantInit(&propvar);
 			PropVariantInit(&propvar);
 
 
-			hr = props->GetValue(PKEY_Device_FriendlyName, &propvar);
+			hr = props->GetValue(PKEY_Device_FriendlyNameGodot, &propvar);
 			ERR_BREAK(hr != S_OK);
 			ERR_BREAK(hr != S_OK);
 
 
 			if (p_device->device_name == String(propvar.pwszVal)) {
 			if (p_device->device_name == String(propvar.pwszVal)) {
@@ -449,7 +449,7 @@ Array AudioDriverWASAPI::audio_device_get_list(bool p_capture) {
 		PROPVARIANT propvar;
 		PROPVARIANT propvar;
 		PropVariantInit(&propvar);
 		PropVariantInit(&propvar);
 
 
-		hr = props->GetValue(PKEY_Device_FriendlyName, &propvar);
+		hr = props->GetValue(PKEY_Device_FriendlyNameGodot, &propvar);
 		ERR_BREAK(hr != S_OK);
 		ERR_BREAK(hr != S_OK);
 
 
 		list.push_back(String(propvar.pwszVal));
 		list.push_back(String(propvar.pwszVal));