From adc645db169a0418d3b778bf63f4881c97f3ae17 Mon Sep 17 00:00:00 2001
From: Josh de Kock <josh@itanimul.li>
Date: Sat, 16 Apr 2016 15:33:11 +0100
Subject: pThreadUtilities.h: Switch to new MacTypes.h header

---
 config/os/macosx/pThreadUtilities.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/os/macosx/pThreadUtilities.h b/config/os/macosx/pThreadUtilities.h
index a8ed705..82f5baa 100644
--- a/config/os/macosx/pThreadUtilities.h
+++ b/config/os/macosx/pThreadUtilities.h
@@ -66,7 +66,7 @@
 #define __PTHREADUTILITIES_H__
 
 #import "pthread.h"
-#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
+#import <MacTypes.h>
 
 #define THREAD_SET_PRIORITY                     0
 #define THREAD_SCHEDULED_PRIORITY               1
-- 
cgit v1.2.1


From 79478b79fa2b1612b23a1f7ca535e9675ce8fbff Mon Sep 17 00:00:00 2001
From: Josh de Kock <josh@itanimul.li>
Date: Sat, 16 Apr 2016 15:33:36 +0100
Subject: drivers/coreaudio: update audio components to use new API

---
 drivers/coreaudio/coreaudio_driver.c | 20 +++++++++++++++++++-
 drivers/coreaudio/coreaudio_driver.h |  3 ++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/coreaudio/coreaudio_driver.c b/drivers/coreaudio/coreaudio_driver.c
index 7f16304..72d875e 100644
--- a/drivers/coreaudio/coreaudio_driver.c
+++ b/drivers/coreaudio/coreaudio_driver.c
@@ -822,12 +822,22 @@ static jack_driver_t *coreaudio_driver_new (char* name,
 	}
 
 	// AUHAL
+#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+	AudioComponentDescription cd = { kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0 };
+	AudioComponent HALOutput = AudioComponentFindNext (NULL, &cd);
+	err1 = AudioComponentInstanceNew (HALOutput, &driver->au_hal);
+#else
 	ComponentDescription cd = { kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0 };
 	Component HALOutput = FindNextComponent (NULL, &cd);
-
 	err1 = OpenAComponent (HALOutput, &driver->au_hal);
+#endif
+
 	if (err1 != noErr) {
+#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+		jack_error ("Error calling AudioComponentInstanceNew");
+#else
 		jack_error ("Error calling OpenAComponent");
+#endif
 		printError (err1);
 		goto error;
 	}
@@ -1001,7 +1011,11 @@ static jack_driver_t *coreaudio_driver_new (char* name,
 
 error:
 	AudioUnitUninitialize (driver->au_hal);
+#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+	AudioComponentInstanceDispose (driver->au_hal);
+#else
 	CloseComponent (driver->au_hal);
+#endif
 	jack_error ("Cannot open the coreaudio driver");
 	free (driver);
 	return NULL;
@@ -1014,7 +1028,11 @@ static void coreaudio_driver_delete (coreaudio_driver_t * driver)
 	AudioDeviceRemovePropertyListener (driver->device_id, 0, true, kAudioDeviceProcessorOverload, notification);
 	free (driver->input_list);
 	AudioUnitUninitialize (driver->au_hal);
+#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+	AudioComponentInstanceDispose (driver->au_hal);
+#else
 	CloseComponent (driver->au_hal);
+#endif
 	free (driver);
 }
 
diff --git a/drivers/coreaudio/coreaudio_driver.h b/drivers/coreaudio/coreaudio_driver.h
index 211549e..d42598e 100644
--- a/drivers/coreaudio/coreaudio_driver.h
+++ b/drivers/coreaudio/coreaudio_driver.h
@@ -29,9 +29,10 @@
 #define __jack_coreaudio_driver_h__
 
 #include <CoreAudio/CoreAudio.h>
+#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
 #include <AudioToolbox/AudioConverter.h>
+#endif
 #include <AudioUnit/AudioUnit.h>
-
 #include <jack/jack.h>
 #include <jack/types.h>
 
-- 
cgit v1.2.1


From ce438a41ffead7bb003a92d2beead81d6cf63c14 Mon Sep 17 00:00:00 2001
From: Josh de Kock <josh@itanimul.li>
Date: Tue, 17 May 2016 08:58:02 +0100
Subject: pThreadUtilities.h: add version checking for inclusion of MacTypes.h
 header

---
 config/os/macosx/pThreadUtilities.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/os/macosx/pThreadUtilities.h b/config/os/macosx/pThreadUtilities.h
index 82f5baa..20cfe8a 100644
--- a/config/os/macosx/pThreadUtilities.h
+++ b/config/os/macosx/pThreadUtilities.h
@@ -66,7 +66,6 @@
 #define __PTHREADUTILITIES_H__
 
 #import "pthread.h"
-#import <MacTypes.h>
 
 #define THREAD_SET_PRIORITY                     0
 #define THREAD_SCHEDULED_PRIORITY               1
@@ -75,6 +74,13 @@
 #include <mach/thread_policy.h>
 #include <mach/thread_act.h>
 #include <CoreAudio/HostTime.h>
+#import <Availability.h>
+
+#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+#import <MacTypes.h>
+#else
+#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
+#endif
 
 static inline UInt32
 _getThreadPriority (pthread_t inThread, int inWhichPriority)
-- 
cgit v1.2.1