From c6d0064e094c17fec64287a847127ce831201466 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 13 Feb 2024 04:35:45 +0100
Subject: [PATCH] Vapor: relax Apple Binaural Renderer detection

---
 libs/ardour/ardour/surround_return.h | 4 ++--
 libs/ardour/surround_return.cc       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/ardour/ardour/surround_return.h b/libs/ardour/ardour/surround_return.h
index 82ba775224..ab331adb05 100644
--- a/libs/ardour/ardour/surround_return.h
+++ b/libs/ardour/ardour/surround_return.h
@@ -28,7 +28,7 @@
 #include <lv2/lv2plug.in/ns/ext/atom/forge.h>
 #endif
 
-#if defined __APPLE__ && MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#ifdef __APPLE__
 #include <CoreServices/CoreServices.h>
 #include <CoreAudio/CoreAudio.h>
 #include <AudioUnit/AudioUnit.h>
@@ -133,7 +133,7 @@ private:
 
 	std::shared_ptr<BinauralRenderControl> _binaural_render_control;
 
-#if defined __APPLE__ &&  MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#ifdef __APPLE__
 	::AudioUnit      _au;
 	AudioBufferList* _au_buffers;
 	samplecnt_t      _au_samples_processed;
diff --git a/libs/ardour/surround_return.cc b/libs/ardour/surround_return.cc
index 63d00037a1..22cbd39559 100644
--- a/libs/ardour/surround_return.cc
+++ b/libs/ardour/surround_return.cc
@@ -61,7 +61,7 @@ SurroundReturn::SurroundReturn (Session& s, Route* r)
 	, _lufs_meter (s.nominal_sample_rate (), 5)
 	, _output_format_control (new OutputFormatControl (false, _("Output Format"), PBD::Controllable::Toggle))
 	, _binaural_render_control (new BinauralRenderControl (false, _("Binaural Renderer"), PBD::Controllable::Toggle))
-#if defined __APPLE__ &&  MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#ifdef __APPLE__
 	, _au (0)
 	, _au_buffers (0)
 	, _au_samples_processed (0)
@@ -105,7 +105,7 @@ SurroundReturn::SurroundReturn (Session& s, Route* r)
 		}
 	}
 
-#if defined __APPLE__ &&  MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#ifdef __APPLE__
 	AudioComponentDescription auDescription = {
 		kAudioUnitType_Mixer,
 		'3dem' /* kAudioUnitSubType_SpatialMixer */,
@@ -205,7 +205,7 @@ SurroundReturn::SurroundReturn (Session& s, Route* r)
 
 SurroundReturn::~SurroundReturn ()
 {
-#if defined __APPLE__ &&  MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#ifdef __APPLE__
 	if (_au) {
 		AudioOutputUnitStop (_au);
 		AudioUnitUninitialize (_au);
@@ -647,7 +647,7 @@ SurroundReturn::state () const
 	return node;
 }
 
-#if defined __APPLE__ &&  MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#ifdef __APPLE__
 OSStatus
 SurroundReturn::_render_callback(
 		void                        *userData,