X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Faudio_unit.cc;h=89aa99bac8f5f903f98d0b81b7d63c6d72618982;hb=e0012e1b88a6a26ebaf0038f40975779480b1453;hp=75a6ceb4b2d7177722af62724d35beb1e31b0846;hpb=8341291deba82bdab89316c493e3f0484a36e827;p=ardour.git diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 75a6ceb4b2..89aa99bac8 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -31,7 +31,7 @@ #include "pbd/pathscanner.h" #include "pbd/locale_guard.h" -#include +#include #include #include @@ -43,6 +43,7 @@ #include "ardour/filesystem_paths.h" #include "ardour/io.h" #include "ardour/audio_unit.h" +#include "ardour/route.h" #include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/utils.h" @@ -54,6 +55,9 @@ #include #include #include +#ifdef WITH_CARBON +#include +#endif #include "i18n.h" @@ -780,6 +784,10 @@ AUPlugin::set_parameter (uint32_t which, float val) return; } + if (get_parameter(which) == val) { + return; + } + const AUParameterDescriptor& d (descriptors[which]); DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set parameter %1 in scope %2 element %3 to %4\n", d.id, d.scope, d.element, val)); unit->SetParameter (d.id, d.scope, d.element, val); @@ -806,7 +814,7 @@ AUPlugin::get_parameter (uint32_t which) const float val = 0.0; if (which < descriptors.size()) { const AUParameterDescriptor& d (descriptors[which]); - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("get value of parameter %1 in scope %2 element %3\n", d.id, d.scope, d.element)); + // DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("get value of parameter %1 in scope %2 element %3\n", d.id, d.scope, d.element)); unit->GetParameter(d.id, d.scope, d.element, val); } return val; @@ -1016,7 +1024,8 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con vector >& 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 //configuration but AU plugins can have multiple I/O @@ -1031,7 +1040,13 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con int32_t possible_out = i->second; 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; } } @@ -1069,8 +1084,21 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con audio_out = 2; found = true; } else if (possible_out < -2) { - /* explicitly variable number of outputs, pick maximum */ - audio_out = -possible_out; + /* explicitly variable number of outputs. + + Since Ardour can handle any configuration, + we have to somehow pick a number. + + We'll use the number of inputs + to the master bus, or 2 if there + is no master bus. + */ + boost::shared_ptr master = _session.master_out(); + if (master) { + audio_out = master->input()->n_ports().n_audio(); + } else { + audio_out = 2; + } found = true; } else { /* exact number of outputs */ @@ -1133,6 +1161,7 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con /* request is too large */ } + if (possible_out == -1) { /* any output configuration possible, provide stereo out */ audio_out = 2; @@ -1144,8 +1173,21 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con audio_out = 2; found = true; } else if (possible_out < -2) { - /* explicitly variable number of outputs, pick maximum */ - audio_out = -possible_out; + /* explicitly variable number of outputs. + + Since Ardour can handle any configuration, + we have to somehow pick a number. + + We'll use the number of inputs + to the master bus, or 2 if there + is no master bus. + */ + boost::shared_ptr master = _session.master_out(); + if (master) { + audio_out = master->input()->n_ports().n_audio(); + } else { + audio_out = 2; + } found = true; } else { /* exact number of outputs */ @@ -1297,9 +1339,14 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ _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 has the capacity to handle our outputs. */ + assert (bufs.available() >= ChanCount (DataType::AUDIO, output_channels)); input_buffers = &bufs; @@ -1307,10 +1354,6 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ input_offset = offset; 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; for (int32_t i = 0; i < output_channels; ++i) { @@ -1318,8 +1361,10 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ 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. no documentation on what setting it - to a non-null value means. + as input by ::render_callback() above. + + a non-null values tells the plugin to render into the buffer pointed + at by the value. */ buffers->mBuffers[i].mData = 0; } @@ -1354,8 +1399,8 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ ts.mSampleTime = frames_processed; ts.mFlags = kAudioTimeStampSampleTimeValid; - // DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 render flags=%2 time=%3 nframes=%4 buffers=%5\n", - // name(), flags, frames_processed, nframes, buffers->mNumberBuffers)); + 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) { @@ -1411,11 +1456,11 @@ AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat, Timecode::BBT_Time bbt; TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset); - tmap.bbt_time_with_metric (_session.transport_frame() + input_offset, bbt, metric); + tmap.bbt_time (_session.transport_frame() + input_offset, bbt); if (outCurrentBeat) { float beat; - beat = metric.meter().beats_per_bar() * bbt.bars; + beat = metric.meter().divisions_per_bar() * bbt.bars; beat += bbt.beats; beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCurrentBeat = beat; @@ -1450,7 +1495,7 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe Timecode::BBT_Time bbt; TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset); - tmap.bbt_time_with_metric (_session.transport_frame() + input_offset, bbt, metric); + tmap.bbt_time (_session.transport_frame() + input_offset, bbt); if (outDeltaSampleOffsetToNextBeat) { if (bbt.ticks == 0) { @@ -1459,12 +1504,12 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe } 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(), metric.meter())); // frames per beat + metric.tempo().frames_per_beat (_session.frame_rate())); // frames per beat } } if (outTimeSig_Numerator) { - *outTimeSig_Numerator = (UInt32) lrintf (metric.meter().beats_per_bar()); + *outTimeSig_Numerator = (UInt32) lrintf (metric.meter().divisions_per_bar()); } if (outTimeSig_Denominator) { *outTimeSig_Denominator = (UInt32) lrintf (metric.meter().note_divisor()); @@ -1474,12 +1519,12 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe /* beat for the start of the bar. 1|1|0 -> 1 - 2|1|0 -> 1 + beats_per_bar - 3|1|0 -> 1 + (2 * beats_per_bar) + 2|1|0 -> 1 + divisions_per_bar + 3|1|0 -> 1 + (2 * divisions_per_bar) etc. */ - *outCurrentMeasureDownBeat = 1 + metric.meter().beats_per_bar() * (bbt.bars - 1); + *outCurrentMeasureDownBeat = 1 + metric.meter().divisions_per_bar() * (bbt.bars - 1); } return noErr; @@ -1545,10 +1590,10 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, if (outCycleStartBeat) { TempoMetric metric = tmap.metric_at (loc->start() + input_offset); - _session.tempo_map().bbt_time_with_metric (loc->start(), bbt, metric); + _session.tempo_map().bbt_time (loc->start(), bbt); float beat; - beat = metric.meter().beats_per_bar() * bbt.bars; + beat = metric.meter().divisions_per_bar() * bbt.bars; beat += bbt.beats; beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; @@ -1557,10 +1602,10 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, if (outCycleEndBeat) { TempoMetric metric = tmap.metric_at (loc->end() + input_offset); - _session.tempo_map().bbt_time_with_metric (loc->end(), bbt, metric); + _session.tempo_map().bbt_time (loc->end(), bbt); float beat; - beat = metric.meter().beats_per_bar() * bbt.bars; + beat = metric.meter().divisions_per_bar() * bbt.bars; beat += bbt.beats; beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; @@ -2096,7 +2141,7 @@ AUPlugin::find_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 ()); - _presets.insert (make_pair (uri, Plugin::PresetRecord (uri, i->first))); + _presets.insert (make_pair (uri, Plugin::PresetRecord (uri, i->first, i->second))); } #endif @@ -2152,7 +2197,7 @@ AUPluginInfo::load (Session& session) Glib::ustring AUPluginInfo::au_cache_path () { - return Glib::build_filename (ARDOUR::user_config_directory().to_string(), "au_cache"); + return Glib::build_filename (ARDOUR::user_config_directory(), "au_cache"); } PluginInfoList* @@ -2677,7 +2722,11 @@ AUPlugin::set_info (PluginInfoPtr info) int AUPlugin::create_parameter_listener (AUEventListenerProc cb, void* arg, float interval_secs) { +#ifdef WITH_CARBON CFRunLoopRef run_loop = (CFRunLoopRef) GetCFRunLoopFromEventLoop(GetCurrentEventLoop()); +#else + CFRunLoopRef run_loop = CFRunLoopGetCurrent(); +#endif CFStringRef loop_mode = kCFRunLoopDefaultMode; if (AUEventListenerCreate (cb, arg, run_loop, loop_mode, interval_secs, interval_secs, &_parameter_listener) != noErr) { @@ -2708,6 +2757,26 @@ AUPlugin::listen_to_parameter (uint32_t param_id) return -1; } + event.mEventType = kAudioUnitEvent_BeginParameterChangeGesture; + event.mArgument.mParameter.mAudioUnit = unit->AU(); + event.mArgument.mParameter.mParameterID = descriptors[param_id].id; + event.mArgument.mParameter.mScope = descriptors[param_id].scope; + event.mArgument.mParameter.mElement = descriptors[param_id].element; + + if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { + return -1; + } + + event.mEventType = kAudioUnitEvent_EndParameterChangeGesture; + event.mArgument.mParameter.mAudioUnit = unit->AU(); + event.mArgument.mParameter.mParameterID = descriptors[param_id].id; + event.mArgument.mParameter.mScope = descriptors[param_id].scope; + event.mArgument.mParameter.mElement = descriptors[param_id].element; + + if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { + return -1; + } + return 0; } @@ -2730,6 +2799,26 @@ AUPlugin::end_listen_to_parameter (uint32_t param_id) return -1; } + event.mEventType = kAudioUnitEvent_BeginParameterChangeGesture; + event.mArgument.mParameter.mAudioUnit = unit->AU(); + event.mArgument.mParameter.mParameterID = descriptors[param_id].id; + event.mArgument.mParameter.mScope = descriptors[param_id].scope; + event.mArgument.mParameter.mElement = descriptors[param_id].element; + + if (AUEventListenerRemoveEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { + return -1; + } + + event.mEventType = kAudioUnitEvent_EndParameterChangeGesture; + event.mArgument.mParameter.mAudioUnit = unit->AU(); + event.mArgument.mParameter.mParameterID = descriptors[param_id].id; + event.mArgument.mParameter.mScope = descriptors[param_id].scope; + event.mArgument.mParameter.mElement = descriptors[param_id].element; + + if (AUEventListenerRemoveEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { + return -1; + } + return 0; } @@ -2742,9 +2831,23 @@ 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) { - ParameterMap::iterator i = parameter_map.find (event->mArgument.mParameter.mParameterID); - - if (i != parameter_map.end()) { - ParameterChanged (i->second, new_value); - } + ParameterMap::iterator i; + + if ((i = parameter_map.find (event->mArgument.mParameter.mParameterID)) == parameter_map.end()) { + return; + } + + switch (event->mEventType) { + case kAudioUnitEvent_BeginParameterChangeGesture: + StartTouch (i->second); + break; + case kAudioUnitEvent_EndParameterChangeGesture: + EndTouch (i->second); + break; + case kAudioUnitEvent_ParameterValueChange: + ParameterChanged (i->second, new_value); + break; + default: + break; + } }