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

coreaudio aggregate device fix for 10.5

Browse source
This commit is contained in:
Robin Gareus 2015-07-24 01:33:49 +02:00
parent 52ef02b387
commit 64baed2b97
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/backends/coreaudio/coreaudio_pcmio.cc
View file

@ -822,12 +822,21 @@ CoreAudioPCM::pcm_start (
AudioDeviceID device_id; AudioDeviceID device_id;
AudioStreamBasicDescription srcFormat, dstFormat; AudioStreamBasicDescription srcFormat, dstFormat;
#ifndef COREAUDIO_108
ComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
Component HALOutput = FindNextComponent(NULL, &cd);
if (!HALOutput) { errorMsg="FindNextComponent"; goto error; }
err = OpenAComponent(HALOutput, &_auhal);
if (err != noErr) { errorMsg="OpenAComponent"; goto error; }
#else
AudioComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0}; AudioComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
AudioComponent HALOutput = AudioComponentFindNext(NULL, &cd); AudioComponent HALOutput = AudioComponentFindNext(NULL, &cd);
if (!HALOutput) { errorMsg="AudioComponentFindNext"; goto error; } if (!HALOutput) { errorMsg="AudioComponentFindNext"; goto error; }
err = AudioComponentInstanceNew(HALOutput, &_auhal); err = AudioComponentInstanceNew(HALOutput, &_auhal);
if (err != noErr) { errorMsg="AudioComponentInstanceNew"; goto error; } if (err != noErr) { errorMsg="AudioComponentInstanceNew"; goto error; }
#endif
err = AudioUnitInitialize(_auhal); err = AudioUnitInitialize(_auhal);
if (err != noErr) { errorMsg="AudioUnitInitialize"; goto error; } if (err != noErr) { errorMsg="AudioUnitInitialize"; goto error; }

2
libs/backends/coreaudio/wscript
View file

@ -30,7 +30,7 @@ def build(bld):
obj.target = 'coreaudio_backend' obj.target = 'coreaudio_backend'
obj.use = 'libardour libpbd' obj.use = 'libardour libpbd'
obj.framework = [ 'CoreAudio', 'AudioToolbox', 'CoreServices' ] obj.framework = [ 'CoreAudio', 'AudioToolbox', 'CoreServices' ]
if bld.env['build_target'] not in [ 'lion' ]: if bld.env['build_target'] not in [ 'lion' ] and (not bld.env['build_arch'] == "ppc"):
obj.framework += [ 'CoreMidi' ] obj.framework += [ 'CoreMidi' ]
else: else:
obj.framework += [ 'CoreMIDI' ] obj.framework += [ 'CoreMIDI' ]