[PATCH 0/1] MR3914: winecoreaudio: Stop using the deprecated kAudioObjectPropertyElementMaster constant.

[Brendan Shanks (＠bshanks)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3914

[PATCH 1/1] winecoreaudio: Stop using the deprecated kAudioObjectPropertyElementMaster constant.

[Brendan Shanks]

From: Brendan Shanks <bshanks(a)codeweavers.com>

---
 dlls/winecoreaudio.drv/coreaudio.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c
index 5cdb3a4f676..0b2f9a1e114 100644
--- a/dlls/winecoreaudio.drv/coreaudio.c
+++ b/dlls/winecoreaudio.drv/coreaudio.c
@@ -70,6 +70,10 @@
 
 #include "unixlib.h"
 
+#if !defined(MAC_OS_VERSION_12_0) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_VERSION_12_0
+#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
+#endif
+
 WINE_DEFAULT_DEBUG_CHANNEL(coreaudio);
 
 #define MAX_DEV_NAME_LEN 10 /* Max 32 bit digits */
@@ -239,7 +243,7 @@ static NTSTATUS unix_get_endpoint_ids(void *args)
     params->default_idx = 0;
 
     addr.mScope = kAudioObjectPropertyScopeGlobal;
-    addr.mElement = kAudioObjectPropertyElementMaster;
+    addr.mElement = kAudioObjectPropertyElementMain;
     if(params->flow == eRender) addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
     else if(params->flow == eCapture) addr.mSelector = kAudioHardwarePropertyDefaultInputDevice;
     else{
@@ -1752,7 +1756,7 @@ static NTSTATUS unix_set_volumes(void *args)
     AudioObjectPropertyAddress prop_addr = {
         kAudioDevicePropertyVolumeScalar,
         kAudioObjectPropertyScopeGlobal,
-        kAudioObjectPropertyElementMaster
+        kAudioObjectPropertyElementMain
     };
 
     sc = AudioObjectSetPropertyData(stream->dev_id, &prop_addr, 0, NULL, sizeof(float), &level);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3914

[PATCH 0/1] MR3914: winecoreaudio: Stop using the deprecated kAudioObjectPropertyElementMaster constant. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3914