smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

Vapor: relax Apple Binaural Renderer detection

Browse source
This commit is contained in:
Robin Gareus 2024-02-13 04:35:45 +01:00
parent 0c96c12a50
commit c6d0064e09
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/surround_return.h
View file

@ -28,7 +28,7 @@
#include <lv2/lv2plug.in/ns/ext/atom/forge.h> #include <lv2/lv2plug.in/ns/ext/atom/forge.h>
#endif #endif
#if defined __APPLE__ && MAC_OS_X_VERSION_MAX_ALLOWED >= 110000 #ifdef __APPLE__
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <CoreAudio/CoreAudio.h> #include <CoreAudio/CoreAudio.h>
#include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnit.h>
@ -133,7 +133,7 @@ private:
std::shared_ptr<BinauralRenderControl> _binaural_render_control; std::shared_ptr<BinauralRenderControl> _binaural_render_control;
#if defined __APPLE__ && MAC_OS_X_VERSION_MAX_ALLOWED >= 110000 #ifdef __APPLE__
::AudioUnit _au; ::AudioUnit _au;
AudioBufferList* _au_buffers; AudioBufferList* _au_buffers;
samplecnt_t _au_samples_processed; samplecnt_t _au_samples_processed;

8
libs/ardour/surround_return.cc
View file

@ -61,7 +61,7 @@ SurroundReturn::SurroundReturn (Session& s, Route* r)
, _lufs_meter (s.nominal_sample_rate (), 5) , _lufs_meter (s.nominal_sample_rate (), 5)
, _output_format_control (new OutputFormatControl (false, _("Output Format"), PBD::Controllable::Toggle)) , _output_format_control (new OutputFormatControl (false, _("Output Format"), PBD::Controllable::Toggle))
, _binaural_render_control (new BinauralRenderControl (false, _("Binaural Renderer"), 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 (0)
, _au_buffers (0) , _au_buffers (0)
, _au_samples_processed (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 = { AudioComponentDescription auDescription = {
kAudioUnitType_Mixer, kAudioUnitType_Mixer,
'3dem' /* kAudioUnitSubType_SpatialMixer */, '3dem' /* kAudioUnitSubType_SpatialMixer */,
@ -205,7 +205,7 @@ SurroundReturn::SurroundReturn (Session& s, Route* r)
SurroundReturn::~SurroundReturn () SurroundReturn::~SurroundReturn ()
{ {
#if defined __APPLE__ && MAC_OS_X_VERSION_MAX_ALLOWED >= 110000 #ifdef __APPLE__
if (_au) { if (_au) {
AudioOutputUnitStop (_au); AudioOutputUnitStop (_au);
AudioUnitUninitialize (_au); AudioUnitUninitialize (_au);
@ -647,7 +647,7 @@ SurroundReturn::state () const
return node; return node;
} }
#if defined __APPLE__ && MAC_OS_X_VERSION_MAX_ALLOWED >= 110000 #ifdef __APPLE__
OSStatus OSStatus
SurroundReturn::_render_callback( SurroundReturn::_render_callback(
void *userData, void *userData,