diff mbox

[PULL,2/5] audio/coreaudio.c: Use new-in-OSX-10.6 API for getting default voice

Message ID 1450174708-20499-3-git-send-email-kraxel@redhat.com
State Accepted
Commit 624d1fc30fd64e082880ca21cae5fadb67d05c64
Headers show

Commit Message

Gerd Hoffmann Dec. 15, 2015, 10:18 a.m. UTC 
From: Peter Maydell <peter.maydell@linaro.org>


If we're building for OSX 10.6 or better, use the new API
AudioObjectGetPropertyData for getting the default voice.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Message-id: 1448747724-15572-3-git-send-email-peter.maydell@linaro.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---
 audio/coreaudio.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

-- 
1.8.3.1
diff mbox

Patch

diff --git a/audio/coreaudio.c b/audio/coreaudio.c
index 433e009..2211e17 100644
--- a/audio/coreaudio.c
+++ b/audio/coreaudio.c
@@ -32,6 +32,10 @@ 
 #define AUDIO_CAP "coreaudio"
 #include "audio_int.h"
 
+#ifndef MAC_OS_X_VERSION_10_6
+#define MAC_OS_X_VERSION_10_6 1060
+#endif
+
 static int isAtexit;
 
 typedef struct {
@@ -50,6 +54,28 @@  typedef struct coreaudioVoiceOut {
     int rpos;
 } coreaudioVoiceOut;
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+/* The APIs used here only become available from 10.6 */
+
+static OSStatus coreaudio_get_voice(AudioDeviceID *id)
+{
+    UInt32 size = sizeof(*id);
+    AudioObjectPropertyAddress addr = {
+        kAudioHardwarePropertyDefaultOutputDevice,
+        kAudioObjectPropertyScopeGlobal,
+        kAudioObjectPropertyElementMaster
+    };
+
+    return AudioObjectGetPropertyData(kAudioObjectSystemObject,
+                                      &addr,
+                                      0,
+                                      NULL,
+                                      &size,
+                                      id);
+}
+#else
+/* Legacy versions of functions using deprecated APIs */
+
 static OSStatus coreaudio_get_voice(AudioDeviceID *id)
 {
     UInt32 size = sizeof(*id);
@@ -59,6 +85,7 @@  static OSStatus coreaudio_get_voice(AudioDeviceID *id)
         &size,
         id);
 }
+#endif
 
 static void coreaudio_logstatus (OSStatus status)
 {