X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_unit.cc;h=0cea4dd09984804c161f88fbe39716f2c3856685;hb=8139becb1898187729b0ea57f145302d4975bf3a;hp=e28d89205395d6c1c2b75d7636cf5155fa4b172c;hpb=00f48c3d633190256e381ec930a49f392184595f;p=ardour.git diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index e28d892053..0cea4dd099 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -71,7 +71,7 @@ #define ArdourFindNext AudioComponentFindNext #endif -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; @@ -163,11 +163,11 @@ _render_callback(void *userData, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, - UInt32 inNumberFrames, + UInt32 inNumberSamples, AudioBufferList* ioData) { if (userData) { - return ((AUPlugin*)userData)->render_callback (ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, ioData); + return ((AUPlugin*)userData)->render_callback (ioActionFlags, inTimeStamp, inBusNumber, inNumberSamples, ioData); } return paramErr; } @@ -430,7 +430,8 @@ AUPlugin::AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptrGetElementCount (kAudioUnitScope_Output, output_elements); - cb_offsets = (framecnt_t*) calloc (input_elements, sizeof(uint32_t)); + cb_offsets = (samplecnt_t*) calloc (input_elements, sizeof(samplecnt_t)); bus_inputs = (uint32_t*) calloc (input_elements, sizeof(uint32_t)); bus_outputs = (uint32_t*) calloc (output_elements, sizeof(uint32_t)); @@ -800,8 +806,6 @@ AUPlugin::discover_parameters () break; } - d.min_unbound = 0; // lower is bound - d.max_unbound = 0; // upper is bound d.update_steps(); descriptors.push_back (d); @@ -946,10 +950,15 @@ AUPlugin::default_value (uint32_t port) return 0; } -framecnt_t +samplecnt_t AUPlugin::signal_latency () const { - return unit->Latency() * _session.frame_rate(); + guint lat = g_atomic_int_get (&_current_latency);; + if (lat == UINT_MAX) { + lat = unit->Latency() * _session.sample_rate(); + g_atomic_int_set (&_current_latency, lat); + } + return lat; } void @@ -1026,7 +1035,7 @@ AUPlugin::activate () if ((err = unit->Initialize()) != noErr) { error << string_compose (_("AUPlugin: %1 cannot initialize plugin (err = %2)"), name(), err) << endmsg; } else { - frames_processed = 0; + samples_processed = 0; initialized = true; } } @@ -1058,17 +1067,17 @@ int AUPlugin::set_block_size (pframes_t nframes) { bool was_initialized = initialized; - UInt32 numFrames = nframes; + UInt32 numSamples = nframes; OSErr err; if (initialized) { deactivate (); } - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set MaximumFramesPerSlice in global scope to %1\n", numFrames)); + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set MaximumFramesPerSlice in global scope to %1\n", numSamples)); if ((err = unit->SetProperty (kAudioUnitProperty_MaximumFramesPerSlice, kAudioUnitScope_Global, - 0, &numFrames, sizeof (numFrames))) != noErr) { - error << string_compose (_("AU: cannot set max frames (err = %1)"), err) << endmsg; + 0, &numSamples, sizeof (numSamples))) != noErr) { + error << string_compose (_("AU: cannot set max samples (err = %1)"), err) << endmsg; return -1; } @@ -1076,8 +1085,6 @@ AUPlugin::set_block_size (pframes_t nframes) activate (); } - _current_block_size = nframes; - return 0; } @@ -1103,7 +1110,7 @@ AUPlugin::configure_io (ChanCount in, ChanCount out) } } - streamFormat.mSampleRate = _session.frame_rate(); + streamFormat.mSampleRate = _session.sample_rate(); streamFormat.mFormatID = kAudioFormatLinearPCM; streamFormat.mFormatFlags = kAudioFormatFlagIsFloat|kAudioFormatFlagIsPacked|kAudioFormatFlagIsNonInterleaved; @@ -1136,7 +1143,7 @@ AUPlugin::configure_io (ChanCount in, ChanCount out) uint32_t used_in = 0; uint32_t used_out = 0; - if (variable_inputs) { + if (variable_inputs || input_elements == 1) { // 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; @@ -1165,7 +1172,7 @@ AUPlugin::configure_io (ChanCount in, ChanCount out) } } - if (variable_outputs) { + if (variable_outputs || output_elements == 1) { if (output_elements > 1) { warning << string_compose (_("AU %1 has multiple output busses and variable port count."), name()) << endmsg; } @@ -1255,13 +1262,48 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out, Cha return false; } - vector >& io_configs = pinfo->cache.io_configs; + vector > io_configs = pinfo->cache.io_configs; + + if (input_elements > 1) { + const vector >& ioc (pinfo->cache.io_configs); + for (vector >::const_iterator i = ioc.begin(); i != ioc.end(); ++i) { + int32_t possible_in = i->first; + int32_t possible_out = i->second; + if (possible_in < 1 || possible_out < 1) { + continue; + } + for (uint32_t i = 1; i < input_elements; ++i) { + // can't use up-to bus_inputs[] + // waves' SC-C6(s) for example fails to configure with only 1 input + // on the 2nd bus. + io_configs.push_back (pair (possible_in + bus_inputs[i], possible_out)); + } + } + } + + if (output_elements > 1) { + const vector >& ioc (pinfo->cache.io_configs); + for (vector >::const_iterator i = ioc.begin(); i != ioc.end(); ++i) { + int32_t possible_in = i->first; + int32_t possible_out = i->second; + if (possible_in < 1 || possible_out < 1) { + continue; + } + for (uint32_t i = 1; i < output_elements; ++i) { + int32_t c = bus_outputs[i]; + for (uint32_t j = 1; j < i; ++j) { + c += bus_outputs [j]; + } + io_configs.push_back (pair (possible_in, possible_out + c)); + } + } + } 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()); + printf ("AU I/O Configs %s %d\n", name(), 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); } @@ -1343,7 +1385,7 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out, Cha _output_configs.insert (0); #define UPTO(nch) { \ - for (int n = 1; n < nch; ++n) { \ + for (int n = 1; n <= nch; ++n) { \ _output_configs.insert (n); \ } \ } @@ -1540,13 +1582,13 @@ OSStatus AUPlugin::render_callback(AudioUnitRenderActionFlags*, const AudioTimeStamp*, UInt32 bus, - UInt32 inNumberFrames, + UInt32 inNumberSamples, AudioBufferList* ioData) { /* not much to do with audio - the data is already in the buffers given to us in connect_and_run() */ - // DEBUG_TRACE (DEBUG::AudioUnits, 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, samples %2 bus %3 bufs %4\n", + // name(), inNumberSamples, bus, ioData->mNumberBuffers)); if (input_maxbuf == 0) { DEBUG_TRACE (DEBUG::AudioUnits, "AUPlugin: render callback called illegally!"); @@ -1569,7 +1611,7 @@ AUPlugin::render_callback(AudioUnitRenderActionFlags*, for (uint32_t i = 0; i < limit; ++i) { ioData->mBuffers[i].mNumberChannels = 1; - ioData->mBuffers[i].mDataByteSize = sizeof (Sample) * inNumberFrames; + ioData->mBuffers[i].mDataByteSize = sizeof (Sample) * inNumberSamples; bool valid = false; uint32_t idx = input_map->get (DataType::AUDIO, i + busoff, &valid); @@ -1579,14 +1621,20 @@ AUPlugin::render_callback(AudioUnitRenderActionFlags*, ioData->mBuffers[i].mData = silent_bufs.get_audio(0).data (cb_offsets[bus] + input_offset); } } - cb_offsets[bus] += inNumberFrames; + cb_offsets[bus] += inNumberSamples; return noErr; } int -AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_map, pframes_t nframes, framecnt_t offset) +AUPlugin::connect_and_run (BufferSet& bufs, + samplepos_t start, samplepos_t end, double speed, + ChanMapping in_map, ChanMapping out_map, + pframes_t nframes, samplecnt_t offset) { - Plugin::connect_and_run (bufs, in_map, out_map, nframes, offset); + Plugin::connect_and_run(bufs, start, end, speed, in_map, out_map, nframes, offset); + + transport_sample = start; + transport_speed = speed; AudioUnitRenderActionFlags flags = 0; AudioTimeStamp ts; @@ -1601,14 +1649,17 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ bool inplace = true; // TODO check plugin-insert in-place ? ChanMapping::Mappings inmap (in_map.mappings ()); ChanMapping::Mappings outmap (out_map.mappings ()); - assert (outmap[DataType::AUDIO].size () > 0); + if (outmap[DataType::AUDIO].size () == 0) { + inplace = false; + } if (inmap[DataType::AUDIO].size() > 0 && inmap != outmap) { inplace = false; } - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 in %2 out %3 MIDI %4 bufs %5 (available %6) Inplace: %7\n", + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 in %2 out %3 MIDI %4 bufs %5 (available %6) InBus %7 OutBus %8 Inplace: %9 var-i/o %10 %11\n", name(), input_channels, output_channels, _has_midi_input, - bufs.count(), bufs.available(), inplace)); + bufs.count(), bufs.available(), + configured_input_busses, configured_output_busses, inplace, variable_inputs, variable_outputs)); /* the apparent number of buffers matches our input configuration, but we know that the bufferset * has the capacity to handle our outputs. @@ -1633,7 +1684,7 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ /* 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); + Evoral::Event 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)); @@ -1651,7 +1702,12 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ 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]); + uint32_t cnt; + if (variable_outputs || (output_elements == configured_output_busses && configured_output_busses == 1)) { + cnt = output_channels; + } else { + cnt = std::min (remain, bus_outputs[bus]); + } assert (cnt > 0); buffers->mNumberBuffers = cnt; @@ -1680,11 +1736,11 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ } /* does this really mean anything ? */ - ts.mSampleTime = frames_processed; + ts.mSampleTime = samples_processed; ts.mFlags = kAudioTimeStampSampleTimeValid; 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)); + name(), flags, samples_processed, nframes, bus, buffers->mNumberBuffers)); if ((err = unit->Render (&flags, &ts, bus, nframes, buffers)) == noErr) { @@ -1704,7 +1760,8 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ } } } else { - error << string_compose (_("AU: render error for %1, bus %2 status = %2"), name(), bus, err) << endmsg; + DEBUG_TRACE (DEBUG::AudioUnits, string_compose (_("AU: render error for %1, bus %2 status = %3\n"), name(), bus, err)); + error << string_compose (_("AU: render error for %1, bus %2 status = %3"), name(), bus, err) << endmsg; ok = false; break; } @@ -1730,7 +1787,7 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ input_maxbuf = 0; if (ok) { - frames_processed += nframes; + samples_processed += nframes; return 0; } return -1; @@ -1744,29 +1801,12 @@ AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat, DEBUG_TRACE (DEBUG::AudioUnits, "AU calls ardour beat&tempo callback\n"); - /* more than 1 meter or more than 1 tempo means that a simplistic computation - (and interpretation) of a beat position will be incorrect. So refuse to - offer the value. - */ - - if (tmap.n_tempos() > 1 || tmap.n_meters() > 1) { - return kAudioUnitErr_CannotDoInCurrentContext; - } - - Timecode::BBT_Time bbt; - TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset); - tmap.bbt_time (_session.transport_frame() + input_offset, bbt); - if (outCurrentBeat) { - float beat; - beat = metric.meter().divisions_per_bar() * bbt.bars; - beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; - *outCurrentBeat = beat; + *outCurrentBeat = tmap.quarter_note_at_sample (transport_sample + input_offset); } if (outCurrentTempo) { - *outCurrentTempo = floor (metric.tempo().beats_per_minute()); + *outCurrentTempo = tmap.tempo_at_sample (transport_sample + input_offset).quarter_notes_per_minute(); } return noErr; @@ -1783,27 +1823,18 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe DEBUG_TRACE (DEBUG::AudioUnits, "AU calls ardour music time location callback\n"); - /* more than 1 meter or more than 1 tempo means that a simplistic computation - (and interpretation) of a beat position will be incorrect. So refuse to - offer the value. - */ - - if (tmap.n_tempos() > 1 || tmap.n_meters() > 1) { - return kAudioUnitErr_CannotDoInCurrentContext; - } - - Timecode::BBT_Time bbt; - TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset); - tmap.bbt_time (_session.transport_frame() + input_offset, bbt); + TempoMetric metric = tmap.metric_at (transport_sample + input_offset); + Timecode::BBT_Time bbt = _session.tempo_map().bbt_at_sample (transport_sample + input_offset); if (outDeltaSampleOffsetToNextBeat) { if (bbt.ticks == 0) { /* on the beat */ *outDeltaSampleOffsetToNextBeat = 0; } else { - *outDeltaSampleOffsetToNextBeat = (UInt32) - floor (((Timecode::BBT_Time::ticks_per_beat - bbt.ticks)/Timecode::BBT_Time::ticks_per_beat) * // fraction of a beat to next beat - metric.tempo().frames_per_beat (_session.frame_rate())); // frames per beat + double const next_beat = ceil (tmap.quarter_note_at_sample (transport_sample + input_offset)); + samplepos_t const next_beat_sample = tmap.sample_at_quarter_note (next_beat); + + *outDeltaSampleOffsetToNextBeat = next_beat_sample - (transport_sample + input_offset); } } @@ -1822,8 +1853,10 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe 3|1|0 -> 1 + (2 * divisions_per_bar) etc. */ + bbt.beats = 1; + bbt.ticks = 0; - *outCurrentMeasureDownBeat = 1 + metric.meter().divisions_per_bar() * (bbt.bars - 1); + *outCurrentMeasureDownBeat = tmap.quarter_note_at_bbt (bbt); } return noErr; @@ -1837,22 +1870,20 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, Float64* outCycleStartBeat, Float64* outCycleEndBeat) { - bool rolling; - float speed; + const bool rolling = (transport_speed != 0); + const bool last_transport_rolling = (last_transport_speed != 0); DEBUG_TRACE (DEBUG::AudioUnits, "AU calls ardour transport state callback\n"); - rolling = _session.transport_rolling(); - speed = _session.transport_speed (); if (outIsPlaying) { - *outIsPlaying = _session.transport_rolling(); + *outIsPlaying = rolling; } if (outTransportStateChanged) { if (rolling != last_transport_rolling) { *outTransportStateChanged = true; - } else if (speed != last_transport_speed) { + } else if (transport_speed != last_transport_speed) { *outTransportStateChanged = true; } else { *outTransportStateChanged = false; @@ -1863,13 +1894,14 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, /* this assumes that the AU can only call this host callback from render context, where input_offset is valid. */ - *outCurrentSampleInTimeLine = _session.transport_frame() + input_offset; + *outCurrentSampleInTimeLine = transport_sample + input_offset; } if (outIsCycling) { + // TODO check bounce-processing Location* loc = _session.locations()->auto_loop_location(); - *outIsCycling = (loc && _session.transport_rolling() && _session.get_play_loop()); + *outIsCycling = (loc && rolling && _session.get_play_loop()); if (*outIsCycling) { @@ -1877,45 +1909,20 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, TempoMap& tmap (_session.tempo_map()); - /* more than 1 meter means that a simplistic computation (and interpretation) of - a beat position will be incorrect. so refuse to offer the value. - */ - - if (tmap.n_meters() > 1) { - return kAudioUnitErr_CannotDoInCurrentContext; - } - Timecode::BBT_Time bbt; if (outCycleStartBeat) { - TempoMetric metric = tmap.metric_at (loc->start() + input_offset); - _session.tempo_map().bbt_time (loc->start(), bbt); - - float beat; - beat = metric.meter().divisions_per_bar() * bbt.bars; - beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; - - *outCycleStartBeat = beat; + *outCycleStartBeat = tmap.quarter_note_at_sample (loc->start() + input_offset); } if (outCycleEndBeat) { - TempoMetric metric = tmap.metric_at (loc->end() + input_offset); - _session.tempo_map().bbt_time (loc->end(), bbt); - - float beat; - beat = metric.meter().divisions_per_bar() * bbt.bars; - beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; - - *outCycleEndBeat = beat; + *outCycleEndBeat = tmap.quarter_note_at_sample (loc->end() + input_offset); } } } } - last_transport_rolling = rolling; - last_transport_speed = speed; + last_transport_speed = transport_speed; return noErr; } @@ -1949,6 +1956,8 @@ AUPlugin::describe_io_port (ARDOUR::DataType dt, bool input, uint32_t id) const break; } + std::string busname; + if (dt == DataType::AUDIO) { if (input) { uint32_t pid = id; @@ -1957,6 +1966,7 @@ AUPlugin::describe_io_port (ARDOUR::DataType dt, bool input, uint32_t id) const id = pid; ss << _bus_name_in[bus]; ss << " / Bus " << (1 + bus); + busname = _bus_name_in[bus]; break; } pid -= bus_inputs[bus]; @@ -1969,6 +1979,7 @@ AUPlugin::describe_io_port (ARDOUR::DataType dt, bool input, uint32_t id) const id = pid; ss << _bus_name_out[bus]; ss << " / Bus " << (1 + bus); + busname = _bus_name_out[bus]; break; } pid -= bus_outputs[bus]; @@ -1985,6 +1996,10 @@ AUPlugin::describe_io_port (ARDOUR::DataType dt, bool input, uint32_t id) const ss << (id + 1); Plugin::IOPortDescription iod (ss.str()); + if (!busname.empty()) { + iod.group_name = busname; + iod.group_channel = id; + } return iod; } @@ -1999,9 +2014,16 @@ AUPlugin::describe_parameter (Evoral::Parameter param) } void -AUPlugin::print_parameter (uint32_t /*param*/, char* /*buf*/, uint32_t /*len*/) const +AUPlugin::print_parameter (uint32_t param, char* buf, uint32_t len) const { // NameValue stuff here + if (buf && len) { + if (param < parameter_count()) { + snprintf (buf, len, "%.3f", get_parameter (param)); + } else { + strcat (buf, "0"); + } + } } bool @@ -2046,7 +2068,7 @@ AUPlugin::parameter_is_output (uint32_t param) const void AUPlugin::add_state (XMLNode* root) const { - LocaleGuard lg (X_("C")); + LocaleGuard lg; CFDataRef xmlData; CFPropertyListRef propertyList; @@ -2085,7 +2107,7 @@ AUPlugin::set_state(const XMLNode& node, int version) { int ret = -1; CFPropertyListRef propertyList; - LocaleGuard lg (X_("C")); + LocaleGuard lg; if (node.name() != state_node_name()) { error << _("Bad node sent to AUPlugin::set_state") << endmsg; @@ -2541,8 +2563,10 @@ AUPlugin::find_presets () /* add factory presets */ for (FactoryPresetMap::iterator i = factory_preset_map.begin(); i != factory_preset_map.end(); ++i) { - /* XXX: dubious */ - string const uri = string_compose ("%1", _presets.size ()); + /* XXX: dubious -- deleting & re-adding a preset -> same URI + * good that we don't support deleting AU presets :) + */ + string const uri = PBD::to_string (_presets.size ()); _presets.insert (make_pair (uri, Plugin::PresetRecord (uri, i->first, false))); DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Adding Factory Preset: %1 > %2\n", i->first, i->second)); } @@ -2882,24 +2906,24 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip continue; case kAudioUnitType_Output: - info->category = _("AudioUnit Outputs"); + info->category = _("AudioUnit Output"); break; case kAudioUnitType_MusicDevice: - info->category = _("AudioUnit Instruments"); + info->category = _("Instrument"); has_midi_in = true; break; case kAudioUnitType_MusicEffect: - info->category = _("AudioUnit MusicEffects"); + info->category = _("Music Effect"); has_midi_in = true; break; case kAudioUnitType_Effect: - info->category = _("AudioUnit Effects"); + info->category = _("Effect"); break; case kAudioUnitType_Mixer: - info->category = _("AudioUnit Mixers"); + info->category = _("Mixer"); break; case kAudioUnitType_Generator: - info->category = _("AudioUnit Generators"); + info->category = _("Generator"); break; default: info->category = _("AudioUnit (Unknown)"); @@ -3040,17 +3064,21 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id, } if (ret > 0) { - - /* no explicit info available, so default to 1in/1out */ - - /* XXX this is wrong. we should be indicating wildcard values */ - + /* AU is expected to deal with same channel valance in and out */ cinfo.io_configs.push_back (pair (-1, -1)); - } else { - /* store each configuration */ - if (comp.Desc().IsGenerator() || comp.Desc().IsMusicDevice()) { - // incrementally add busses + /* CAAudioUnit::GetChannelInfo silently merges bus formats + * check if this was the case and if so, add + * bus configs as incremental options. + */ + Boolean* isWritable = 0; + UInt32 dataSize = 0; + OSStatus result = AudioUnitGetPropertyInfo (unit.AU(), + kAudioUnitProperty_SupportedNumChannels, + kAudioUnitScope_Global, 0, + &dataSize, isWritable); + if (result != noErr && (comp.Desc().IsGenerator() || comp.Desc().IsMusicDevice())) { + /* incrementally add busses */ int in = 0; int out = 0; for (uint32_t n = 0; n < cnt; ++n) { @@ -3059,6 +3087,7 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id, cinfo.io_configs.push_back (pair (in, out)); } } 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)); @@ -3099,22 +3128,19 @@ AUPluginInfo::save_cached_info () XMLNode* node; node = new XMLNode (X_("AudioUnitPluginCache")); - node->add_property( "version", AU_CACHE_VERSION ); + node->set_property( "version", AU_CACHE_VERSION ); for (map::iterator i = cached_info.begin(); i != cached_info.end(); ++i) { XMLNode* parent = new XMLNode (X_("plugin")); - parent->add_property ("id", i->first); + parent->set_property ("id", i->first); node->add_child_nocopy (*parent); for (vector >::iterator j = i->second.io_configs.begin(); j != i->second.io_configs.end(); ++j) { XMLNode* child = new XMLNode (X_("io")); - char buf[32]; - snprintf (buf, sizeof (buf), "%d", j->first); - child->add_property (X_("in"), buf); - snprintf (buf, sizeof (buf), "%d", j->second); - child->add_property (X_("out"), buf); + child->set_property (X_("in"), j->first); + child->set_property (X_("out"), j->second); parent->add_child_nocopy (*child); } @@ -3153,7 +3179,7 @@ AUPluginInfo::load_cached_info () } //initial version has incorrectly stored i/o info, and/or garbage chars. - const XMLProperty* version = root->property(X_("version")); + XMLProperty const * version = root->property(X_("version")); if (! ((version != NULL) && (version->value() == X_(AU_CACHE_VERSION)))) { error << "au_cache is not correct version. AU plugins will be re-scanned" << endmsg; return -1; @@ -3171,13 +3197,12 @@ AUPluginInfo::load_cached_info () const XMLNode* gchild; const XMLNodeList gchildren = child->children(); - const XMLProperty* prop = child->property (X_("id")); - if (!prop) { + string id; + if (!child->get_property (X_("id"), id)) { continue; } - string id = prop->value(); string fixed; string version; @@ -3207,16 +3232,10 @@ AUPluginInfo::load_cached_info () if (gchild->name() == X_("io")) { - int in; - int out; - const XMLProperty* iprop; - const XMLProperty* oprop; - - if (((iprop = gchild->property (X_("in"))) != 0) && - ((oprop = gchild->property (X_("out"))) != 0)) { - in = atoi (iprop->value()); - out = atoi (oprop->value()); + int32_t in; + int32_t out; + if (gchild->get_property (X_("in"), in) && gchild->get_property (X_("out"), out)) { cinfo.io_configs.push_back (pair (in, out)); } } @@ -3307,6 +3326,19 @@ AUPlugin::create_parameter_listener (AUEventListenerProc cb, void* arg, float in _parameter_listener_arg = arg; + // listen for latency changes + AudioUnitEvent event; + event.mEventType = kAudioUnitEvent_PropertyChange; + event.mArgument.mProperty.mAudioUnit = unit->AU(); + event.mArgument.mProperty.mPropertyID = kAudioUnitProperty_Latency; + event.mArgument.mProperty.mScope = kAudioUnitScope_Global; + event.mArgument.mProperty.mElement = 0; + + if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { + PBD::error << "Failed to create latency event listener\n"; + // TODO don't cache _current_latency + } + return 0; } @@ -3403,6 +3435,15 @@ AUPlugin::_parameter_change_listener (void* arg, void* src, const AudioUnitEvent void AUPlugin::parameter_change_listener (void* /*arg*/, void* src, const AudioUnitEvent* event, UInt64 /*host_time*/, Float32 new_value) { + if (event->mEventType == kAudioUnitEvent_PropertyChange) { + if (event->mArgument.mProperty.mPropertyID == kAudioUnitProperty_Latency) { + DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Latency Change Event %1 <> %2\n", new_value, unit->Latency())); + guint lat = unit->Latency() * _session.sample_rate(); + g_atomic_int_set (&_current_latency, lat); + } + return; + } + ParameterMap::iterator i; if ((i = parameter_map.find (event->mArgument.mParameter.mParameterID)) == parameter_map.end()) {