From 73aab79d596c68e82fdce961e0c85ceb145d8f51 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 22 Apr 2016 18:47:45 +0200 Subject: [PATCH] AU multibus support --- libs/ardour/ardour/audio_unit.h | 16 +- libs/ardour/audio_unit.cc | 467 ++++++++++++++++++++++---------- 2 files changed, 331 insertions(+), 152 deletions(-) diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index 63bd05b50d..20bf2c849a 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -88,6 +88,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin pframes_t nframes, framecnt_t offset); std::set automatable() const; std::string describe_parameter (Evoral::Parameter); + IOPortDescription describe_io_port (DataType dt, bool input, uint32_t id) const; std::string state_node_name () const { return "audiounit"; } void print_parameter (uint32_t, char*, uint32_t len) const; @@ -193,9 +194,18 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin UInt32 output_elements; UInt32 input_elements; - int set_output_format (AudioStreamBasicDescription&); - int set_input_format (AudioStreamBasicDescription&); - int set_stream_format (int scope, uint32_t cnt, AudioStreamBasicDescription&); + bool variable_inputs; + bool variable_outputs; + + uint32_t configured_input_busses; + uint32_t configured_output_busses; + + uint32_t *bus_inputs; + uint32_t *bus_outputs; + std::vector _bus_name_in; + std::vector _bus_name_out; + + int set_stream_format (int scope, uint32_t bus, AudioStreamBasicDescription&); void discover_parameters (); void add_state (XMLNode *) const; diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 74b61b1290..1acb5633cd 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -433,6 +433,12 @@ AUPlugin::AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptrUninitialize (); } - if (buffers) { - free (buffers); - } + free (buffers); + free (bus_inputs); + free (bus_outputs); } void @@ -586,18 +598,57 @@ AUPlugin::init () DEBUG_TRACE (DEBUG::AudioUnits, "count output elements\n"); unit->GetElementCount (kAudioUnitScope_Output, output_elements); - if (input_elements > 0) { - /* setup render callback: the plugin calls this to get input data - */ + bus_inputs = (uint32_t*) calloc (input_elements, sizeof(uint32_t)); + bus_outputs = (uint32_t*) calloc (output_elements, sizeof(uint32_t)); + for (size_t i = 0; i < output_elements; ++i) { + AudioUnitReset (unit->AU(), kAudioUnitScope_Output, i); + AudioStreamBasicDescription fmt; + UInt32 sz = sizeof(AudioStreamBasicDescription); + err = AudioUnitGetProperty(unit->AU(), kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, i, &fmt, &sz); + if (err == noErr) { + bus_outputs[i] = fmt.mChannelsPerFrame; + } + CFStringRef name; + sz = sizeof (CFStringRef); + if (AudioUnitGetProperty (unit->AU(), kAudioUnitProperty_ElementName, kAudioUnitScope_Output, + i, &name, &sz) == noErr + && sz > 0) { + _bus_name_out.push_back (CFStringRefToStdString (name)); + CFRelease(name); + } else { + _bus_name_out.push_back (string_compose ("Audio-Bus %1", i)); + } + } + + for (size_t i = 0; i < input_elements; ++i) { + AudioUnitReset (unit->AU(), kAudioUnitScope_Input, i); + AudioStreamBasicDescription fmt; + UInt32 sz = sizeof(AudioStreamBasicDescription); + err = AudioUnitGetProperty(unit->AU(), kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, i, &fmt, &sz); + if (err == noErr) { + bus_inputs[i] = fmt.mChannelsPerFrame; + } + CFStringRef name; + sz = sizeof (CFStringRef); + if (AudioUnitGetProperty (unit->AU(), kAudioUnitProperty_ElementName, kAudioUnitScope_Input, + i, &name, &sz) == noErr + && sz > 0) { + _bus_name_in.push_back (CFStringRefToStdString (name)); + CFRelease(name); + } else { + _bus_name_in.push_back (string_compose ("Audio-Bus %1", i)); + } + } + + for (size_t i = 0; i < input_elements; ++i) { + /* setup render callback: the plugin calls this to get input data */ AURenderCallbackStruct renderCallbackInfo; - renderCallbackInfo.inputProc = _render_callback; renderCallbackInfo.inputProcRefCon = this; - DEBUG_TRACE (DEBUG::AudioUnits, "set render callback in input scope\n"); if ((err = unit->SetProperty (kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, - 0, (void*) &renderCallbackInfo, sizeof(renderCallbackInfo))) != 0) { + i, (void*) &renderCallbackInfo, sizeof(renderCallbackInfo))) != 0) { error << string_compose (_("cannot install render callback (err = %1)"), err) << endmsg; throw failed_constructor(); } @@ -1038,7 +1089,7 @@ AUPlugin::configure_io (ChanCount in, ChanCount out) if (audio_input_cnt > 0) { in.set (DataType::AUDIO, audio_input_cnt); } - int32_t audio_in = in.n_audio(); + const int32_t audio_in = in.n_audio(); DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("configure %1 for %2 in %3 out\n", name(), in, out)); @@ -1065,23 +1116,88 @@ AUPlugin::configure_io (ChanCount in, ChanCount out) streamFormat.mFramesPerPacket = 1; /* apple says that for non-interleaved data, these - values always refer to a single channel. - */ + * values always refer to a single channel. + */ streamFormat.mBytesPerPacket = 4; streamFormat.mBytesPerFrame = 4; - streamFormat.mChannelsPerFrame = audio_in; - - if (set_input_format (streamFormat) != 0) { - return false; + configured_input_busses = 0; + configured_output_busses = 0; + /* reset busses */ + for (size_t i = 0; i < output_elements; ++i) { + AudioUnitReset (unit->AU(), kAudioUnitScope_Output, i); + } + for (size_t i = 0; i < input_elements; ++i) { + AudioUnitReset (unit->AU(), kAudioUnitScope_Input, i); } - streamFormat.mChannelsPerFrame = audio_out; + /* now assign the channels to available busses */ + uint32_t used_in = 0; + uint32_t used_out = 0; - if (set_output_format (streamFormat) != 0) { - return false; + if (variable_inputs) { + // we only ever use the first bus + if (input_elements > 1) { + warning << string_compose (_("AU %1 has multiple input busses and variable port count."), name()) << endmsg; + } + streamFormat.mChannelsPerFrame = audio_in; + if (set_stream_format (kAudioUnitScope_Input, 0, streamFormat) != 0) { + return false; + } + configured_input_busses = 1; + used_in = audio_in; + } else { + configured_input_busses = 0; + uint32_t remain = audio_in; + for (uint32_t bus = 0; remain > 0 && bus < input_elements; ++bus) { + uint32_t cnt = std::min (remain, bus_inputs[bus]); + if (cnt == 0) { continue; } + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 configure input bus: %2 chn: %3", name(), bus, cnt)); + + streamFormat.mChannelsPerFrame = cnt; + if (set_stream_format (kAudioUnitScope_Input, bus, streamFormat) != 0) { + return false; + } + used_in += cnt; + ++configured_input_busses; + remain -= cnt; + } } + if (variable_outputs) { + if (output_elements > 1) { + warning << string_compose (_("AU %1 has multiple output busses and variable port count."), name()) << endmsg; + } + + streamFormat.mChannelsPerFrame = audio_out; + if (set_stream_format (kAudioUnitScope_Output, 0, streamFormat) != 0) { + return false; + } + configured_output_busses = 1; + used_out = audio_out; + } else { + uint32_t remain = audio_out; + configured_output_busses = 0; + for (uint32_t bus = 0; remain > 0 && bus < output_elements; ++bus) { + uint32_t cnt = std::min (remain, bus_outputs[bus]); + if (cnt == 0) { continue; } + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 configure output bus: %2 chn: %3", name(), bus, cnt)); + streamFormat.mChannelsPerFrame = cnt; + if (set_stream_format (kAudioUnitScope_Output, bus, streamFormat) != 0) { + return false; + } + used_out += cnt; + remain -= cnt; + ++configured_output_busses; + } + } + + free (buffers); + buffers = (AudioBufferList *) malloc (offsetof(AudioBufferList, mBuffers) + + used_out * sizeof(::AudioBuffer)); + + input_channels = used_in; + output_channels = used_out; /* reset plugin info to show currently configured state */ _info->n_inputs = in; @@ -1098,8 +1214,6 @@ ChanCount AUPlugin::input_streams() const { ChanCount c; - - if (input_channels < 0) { // force PluginIoReConfigure -- see also commit msg e38eb06 c.set (DataType::AUDIO, 0); @@ -1108,7 +1222,6 @@ AUPlugin::input_streams() const c.set (DataType::AUDIO, input_channels); c.set (DataType::MIDI, _has_midi_input ? 1 : 0); } - return c; } @@ -1117,7 +1230,6 @@ ChanCount AUPlugin::output_streams() const { ChanCount c; - if (output_channels < 0) { // force PluginIoReConfigure - see also commit msg e38eb06 c.set (DataType::AUDIO, 0); @@ -1126,7 +1238,6 @@ AUPlugin::output_streams() const c.set (DataType::AUDIO, output_channels); c.set (DataType::MIDI, _has_midi_output ? 1 : 0); } - return c; } @@ -1148,6 +1259,13 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out, Cha DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations, looking for %3 in, %4 out\n", name(), io_configs.size(), in, out)); +#if 0 + printf ("AU I/O Configs %s %d\n", name().c_str(), io_configs.size()); + for (vector >::iterator i = io_configs.begin(); i != io_configs.end(); ++i) { + printf ("- I/O %d / %d\n", i->first, i->second); + } +#endif + // preferred setting (provided by plugin_insert) const int preferred_out = out.n_audio (); bool found = false; @@ -1201,6 +1319,10 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out, Cha int32_t audio_out = -1; float penalty = 9999; int used_possible_in = 0; +#if defined (__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wtautological-compare" +#endif #define FOUNDCFG(nch) { \ float p = fabsf ((float)(nch) - preferred_out); \ @@ -1211,6 +1333,8 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out, Cha audio_out = (nch); \ penalty = p; \ found = true; \ + variable_inputs = possible_in < 0; \ + variable_outputs = possible_out < 0; \ } \ } @@ -1389,95 +1513,76 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out, Cha } DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: in %1 out %2\n", in, out)); +#if defined (__clang__) +# pragma clang diagnostic pop +#endif return true; } int -AUPlugin::set_input_format (AudioStreamBasicDescription& fmt) -{ - return set_stream_format (kAudioUnitScope_Input, input_elements, fmt); -} - -int -AUPlugin::set_output_format (AudioStreamBasicDescription& fmt) -{ - if (set_stream_format (kAudioUnitScope_Output, output_elements, fmt) != 0) { - return -1; - } - - if (buffers) { - free (buffers); - buffers = 0; - } - - buffers = (AudioBufferList *) malloc (offsetof(AudioBufferList, mBuffers) + - fmt.mChannelsPerFrame * sizeof(::AudioBuffer)); - - return 0; -} - -int -AUPlugin::set_stream_format (int scope, uint32_t cnt, AudioStreamBasicDescription& fmt) +AUPlugin::set_stream_format (int scope, uint32_t bus, AudioStreamBasicDescription& fmt) { OSErr result; - for (uint32_t i = 0; i < cnt; ++i) { - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set stream format for %1, scope = %2 element %3\n", - (scope == kAudioUnitScope_Input ? "input" : "output"), - scope, cnt)); - if ((result = unit->SetFormat (scope, i, fmt)) != 0) { - error << string_compose (_("AUPlugin: could not set stream format for %1/%2 (err = %3)"), - (scope == kAudioUnitScope_Input ? "input" : "output"), i, result) << endmsg; - return -1; - } + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set stream format for %1, scope = %2 element %3\n", + (scope == kAudioUnitScope_Input ? "input" : "output"), + scope, bus)); + if ((result = unit->SetFormat (scope, bus, fmt)) != 0) { + error << string_compose (_("AUPlugin: could not set stream format for %1/%2 (err = %3)"), + (scope == kAudioUnitScope_Input ? "input" : "output"), bus, result) << endmsg; + return -1; } - - if (scope == kAudioUnitScope_Input) { - input_channels = fmt.mChannelsPerFrame; - } else { - output_channels = fmt.mChannelsPerFrame; - } - return 0; } OSStatus AUPlugin::render_callback(AudioUnitRenderActionFlags*, const AudioTimeStamp*, - UInt32, - UInt32 inNumberFrames, - AudioBufferList* ioData) + UInt32 bus, + UInt32 inNumberFrames, + AudioBufferList* ioData) { /* not much to do with audio - the data is already in the buffers given to us in connect_and_run() */ + cerr << string_compose ("%1: render callback, frames %2 bus %3 bufs %4\n", + name(), inNumberFrames, bus, ioData->mNumberBuffers); - // DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1: render callback, frames %2 bufs %3\n", - // name(), inNumberFrames, ioData->mNumberBuffers)); + // DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1: render callback, frames %2 bus %3 bufs %4\n", + // name(), inNumberFrames, bus, ioData->mNumberBuffers)); if (input_maxbuf == 0) { DEBUG_TRACE (DEBUG::AudioUnits, "AUPlugin: render callback called illegally!"); error << _("AUPlugin: render callback called illegally!") << endmsg; return kAudioUnitErr_CannotDoInCurrentContext; } + + assert (bus < input_elements); + uint32_t busoff = 0; + for (uint32_t i = 0; i < bus; ++i) { + busoff += bus_inputs[i]; + } + uint32_t limit = min ((uint32_t) ioData->mNumberBuffers, input_maxbuf); ChanCount bufs_count (DataType::AUDIO, 1); BufferSet& silent_bufs = _session.get_silent_buffers(bufs_count); + /* apply bus offsets */ + for (uint32_t i = 0; i < limit; ++i) { ioData->mBuffers[i].mNumberChannels = 1; ioData->mBuffers[i].mDataByteSize = sizeof (Sample) * inNumberFrames; bool valid = false; - uint32_t idx = input_map->get (DataType::AUDIO, i, &valid); + uint32_t idx = input_map->get (DataType::AUDIO, i + busoff, &valid); if (valid) { ioData->mBuffers[i].mData = input_buffers->get_audio (idx).data (cb_offset + input_offset); } else { ioData->mBuffers[i].mData = silent_bufs.get_audio(0).data (cb_offset + input_offset); } } - +#if 0 // TODO per bus cb_offset += inNumberFrames; - +#endif return noErr; } @@ -1496,7 +1601,7 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ } /* test if we can run in-place; only compare audio buffers */ - bool inplace = true; + bool inplace = true; // configured_output_busses == 1; ChanMapping::Mappings inmap (in_map.mappings ()); ChanMapping::Mappings outmap (out_map.mappings ()); assert (outmap[DataType::AUDIO].size () > 0); @@ -1520,104 +1625,108 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ input_offset = offset; cb_offset = 0; - buffers->mNumberBuffers = output_channels; - ChanCount bufs_count (DataType::AUDIO, 1); BufferSet& scratch_bufs = _session.get_scratch_buffers(bufs_count); - for (int32_t i = 0; i < output_channels; ++i) { - buffers->mBuffers[i].mNumberChannels = 1; - buffers->mBuffers[i].mDataByteSize = nframes * sizeof (Sample); - /* setting this to 0 indicates to the AU that it can provide buffers here - * if necessary. if it can process in-place, it will use the buffers provided - * as input by ::render_callback() above. - * - * a non-null values tells the plugin to render into the buffer pointed - * at by the value. - */ - if (inplace) { - buffers->mBuffers[i].mData = 0; - } else { - bool valid = false; - uint32_t idx = out_map.get (DataType::AUDIO, i, &valid); - if (valid) { - buffers->mBuffers[i].mData = bufs.get_audio (idx).data (offset); - } else { - buffers->mBuffers[i].mData = scratch_bufs.get_audio(0).data(offset); - } - } - } - if (_has_midi_input) { - uint32_t nmidi = bufs.count().n_midi(); - for (uint32_t i = 0; i < nmidi; ++i) { - /* one MIDI port/buffer only */ - MidiBuffer& m = bufs.get_midi (i); - for (MidiBuffer::iterator i = m.begin(); i != m.end(); ++i) { Evoral::MIDIEvent ev (*i); - if (ev.is_channel_event()) { const uint8_t* b = ev.buffer(); DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1: MIDI event %2\n", name(), ev)); unit->MIDIEvent (b[0], b[1], b[2], ev.time()); } - /* XXX need to handle sysex and other message types */ } } } - /* does this really mean anything ? */ + bool ok = true; + uint32_t busoff = 0; + uint32_t remain = output_channels; + for (uint32_t bus = 0; remain > 0 && bus < configured_output_busses; ++bus) { + uint32_t cnt = std::min (remain, bus_outputs[bus]); + assert (cnt > 0); - ts.mSampleTime = frames_processed; - ts.mFlags = kAudioTimeStampSampleTimeValid; + buffers->mNumberBuffers = cnt; - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 render flags=%2 time=%3 nframes=%4 buffers=%5\n", - name(), flags, frames_processed, nframes, buffers->mNumberBuffers)); - - if ((err = unit->Render (&flags, &ts, 0, nframes, buffers)) == noErr) { - - input_maxbuf = 0; - frames_processed += nframes; - - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 rendered %2 buffers of %3\n", - name(), buffers->mNumberBuffers, output_channels)); - - int32_t limit = min ((int32_t) buffers->mNumberBuffers, output_channels); - int32_t i; - - for (i = 0; i < limit; ++i) { - bool valid = false; - uint32_t idx = out_map.get (DataType::AUDIO, i, &valid); - if (!valid) continue; - Sample* expected_buffer_address = bufs.get_audio (idx).data (offset); - if (expected_buffer_address != buffers->mBuffers[i].mData) { - /* plugin provided its own buffer for output so copy it back to where we want it - */ - memcpy (expected_buffer_address, buffers->mBuffers[i].mData, nframes * sizeof (Sample)); + for (uint32_t i = 0; i < cnt; ++i) { + buffers->mBuffers[i].mNumberChannels = 1; + buffers->mBuffers[i].mDataByteSize = nframes * sizeof (Sample); + /* setting this to 0 indicates to the AU that it can provide buffers here + * if necessary. if it can process in-place, it will use the buffers provided + * as input by ::render_callback() above. + * + * a non-null values tells the plugin to render into the buffer pointed + * at by the value. + */ + if (inplace) { + buffers->mBuffers[i].mData = 0; + } else { + bool valid = false; + uint32_t idx = out_map.get (DataType::AUDIO, i + busoff, &valid); + if (valid) { + buffers->mBuffers[i].mData = bufs.get_audio (idx).data (offset); + } else { + buffers->mBuffers[i].mData = scratch_bufs.get_audio(0).data(offset); + } } } - /* now silence any buffers that were passed in but the that the plugin - * did not fill/touch/use. - */ + /* does this really mean anything ? */ + ts.mSampleTime = frames_processed; + ts.mFlags = kAudioTimeStampSampleTimeValid; - for (;i < output_channels; ++i) { - bool valid = false; - uint32_t idx = out_map.get (DataType::AUDIO, i, &valid); - if (!valid) continue; - memset (bufs.get_audio (idx).data (offset), 0, nframes * sizeof (Sample)); + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 render flags=%2 time=%3 nframes=%4 bus=%5 buffers=%6\n", + name(), flags, frames_processed, nframes, bus, buffers->mNumberBuffers)); + + if ((err = unit->Render (&flags, &ts, bus, nframes, buffers)) == noErr) { + + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 rendered %2 buffers of %3\n", + name(), buffers->mNumberBuffers, output_channels)); + + uint32_t limit = std::min ((uint32_t) buffers->mNumberBuffers, cnt); + for (uint32_t i = 0; i < limit; ++i) { + bool valid = false; + uint32_t idx = out_map.get (DataType::AUDIO, i + busoff, &valid); + if (!valid) continue; + Sample* expected_buffer_address = bufs.get_audio (idx).data (offset); + if (expected_buffer_address != buffers->mBuffers[i].mData) { + /* plugin provided its own buffer for output so copy it back to where we want it */ + memcpy (expected_buffer_address, buffers->mBuffers[i].mData, nframes * sizeof (Sample)); + } + } + } else { + error << string_compose (_("AU: render error for %1, bus %2 status = %2"), name(), bus, err) << endmsg; + ok = false; + break; } + remain -= cnt; + busoff += bus_outputs[bus]; + } +#if 0 + /* now silence any buffers that were passed in but the that the plugin + * did not fill/touch/use. + */ + for (;i < output_channels; ++i) { + bool valid = false; + uint32_t idx = out_map.get (DataType::AUDIO, i, &valid); + if (!valid) continue; + memset (bufs.get_audio (idx).data (offset), 0, nframes * sizeof (Sample)); + } +#endif + + input_maxbuf = 0; + + if (ok) { + frames_processed += nframes; return 0; } - - error << string_compose (_("AU: render error for %1, status = %2"), name(), err) << endmsg; return -1; } @@ -1819,6 +1928,58 @@ AUPlugin::automatable() const return automates; } +Plugin::IOPortDescription +AUPlugin::describe_io_port (ARDOUR::DataType dt, bool input, uint32_t id) const +{ + std::stringstream ss; + switch (dt) { + case DataType::AUDIO: + break; + case DataType::MIDI: + ss << _("Midi"); + break; + default: + ss << _("?"); + break; + } + + if (dt == DataType::AUDIO) { + if (input) { + uint32_t pid = id; + for (uint32_t bus = 0; bus < input_elements; ++bus) { + if (pid < bus_inputs[bus]) { + id = pid; + ss << _bus_name_in[bus]; + break; + } + pid -= bus_inputs[bus]; + } + } + else { + uint32_t pid = id; + for (uint32_t bus = 0; bus < output_elements; ++bus) { + if (pid < bus_outputs[bus]) { + id = pid; + ss << _bus_name_out[bus]; + break; + } + pid -= bus_outputs[bus]; + } + } + } + + if (input) { + ss << " " << _("In") << " "; + } else { + ss << " " << _("Out") << " "; + } + + ss << (id + 1); + + Plugin::IOPortDescription iod (ss.str()); + return iod; +} + string AUPlugin::describe_parameter (Evoral::Parameter param) { @@ -2747,8 +2908,7 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip info->type = ARDOUR::AudioUnit; info->unique_id = stringify_descriptor (*info->descriptor); - /* XXX not sure of the best way to handle plugin versioning yet - */ + /* XXX not sure of the best way to handle plugin versioning yet */ CAComponent cacomp (*info->descriptor); @@ -2878,12 +3038,21 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id, cinfo.io_configs.push_back (pair (-1, -1)); } else { - /* store each configuration */ - - for (uint32_t n = 0; n < cnt; ++n) { - cinfo.io_configs.push_back (pair (channel_info[n].inChannels, - channel_info[n].outChannels)); + if (comp.Desc().IsGenerator() || comp.Desc().IsMusicDevice()) { + // incrementally add busses + int in = 0; + int out = 0; + for (uint32_t n = 0; n < cnt; ++n) { + in += channel_info[n].inChannels; + out += channel_info[n].outChannels; + cinfo.io_configs.push_back (pair (in, out)); + } + } else { + for (uint32_t n = 0; n < cnt; ++n) { + cinfo.io_configs.push_back (pair (channel_info[n].inChannels, + channel_info[n].outChannels)); + } } free (channel_info);