ardour/livetrax
13
0
Fork 0
Code

when selecting one of a set of variable I/O configs for an AudioUnit so that its output matches its input, be sure to define the output configuration before returning to continue with configuration of subsequent processors. Fixes crash when loading various non-apple AU's as the first pre-fader plugin (#4909)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12566 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-05 04:25:53 +00:00
parent eaf58fdd50
commit 9a0b1cce07
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ardour/audio_unit.cc
View File

@ -1019,7 +1019,8 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con
vector<pair<int,int> >& io_configs = pinfo->cache.io_configs; vector<pair<int,int> >& io_configs = pinfo->cache.io_configs;
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations\n", name(), io_configs.size())); DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations, looking for %3 in, %4 out\n",
name(), io_configs.size(), in, out));
//Ardour expects the plugin to tell it the output //Ardour expects the plugin to tell it the output
//configuration but AU plugins can have multiple I/O //configuration but AU plugins can have multiple I/O
@ -1034,7 +1035,13 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con
int32_t possible_out = i->second; int32_t possible_out = i->second;
if ((possible_in == audio_in) && (possible_out == audio_out)) { if ((possible_in == audio_in) && (possible_out == audio_out)) {
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: in %1 out %2\n", in, out)); DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: %1 in %2 out to match in %3 out %4\n",
possible_in, possible_out,
in, out));
out.set (DataType::MIDI, 0);
out.set (DataType::AUDIO, audio_out);
return 1; return 1;
} }
} }
@ -1300,9 +1307,14 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_
_last_nframes = nframes; _last_nframes = nframes;
} }
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 in %2 out %3 MIDI %4 bufs %5 (available %6)\n",
name(), input_channels, output_channels, _has_midi_input,
bufs.count(), bufs.available()));
/* the apparent number of buffers matches our input configuration, but we know that the bufferset /* the apparent number of buffers matches our input configuration, but we know that the bufferset
has the capacity to handle our outputs. has the capacity to handle our outputs.
*/ */
assert (bufs.available() >= ChanCount (DataType::AUDIO, output_channels)); assert (bufs.available() >= ChanCount (DataType::AUDIO, output_channels));
input_buffers = &bufs; input_buffers = &bufs;
@ -1310,10 +1322,6 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_
input_offset = offset; input_offset = offset;
cb_offset = 0; cb_offset = 0;
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 in %2 out %3 MIDI %4 bufs %5 (available %6)\n",
name(), input_channels, output_channels, _has_midi_input,
bufs.count(), bufs.available()));
buffers->mNumberBuffers = output_channels; buffers->mNumberBuffers = output_channels;
for (int32_t i = 0; i < output_channels; ++i) { for (int32_t i = 0; i < output_channels; ++i) {