X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_unit.cc;h=0e9a11e6dfcb003816c41d66318b037235cebbf5;hb=9bdf0a5e7918c8c6fca2f196cedf72cf69c99b76;hp=d6348af2e3cac7b273e6d00970b4292df014ae28;hpb=ceaf76b5051ae9d3aba9de2175397c7d6796e77a;p=ardour.git diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index d6348af2e3..0e9a11e6df 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" @@ -64,13 +65,6 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -#ifndef AU_STATE_SUPPORT -static bool seen_get_state_message = false; -static bool seen_set_state_message = false; -static bool seen_loading_message = false; -static bool seen_saving_message = false; -#endif - AUPluginInfo::CachedInfoMap AUPluginInfo::cached_info; static string preset_search_path = "/Library/Audio/Presets:/Network/Library/Audio/Presets"; @@ -783,6 +777,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); @@ -809,7 +807,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; @@ -1019,7 +1017,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 @@ -1034,7 +1033,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; } } @@ -1072,8 +1077,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 */ @@ -1136,6 +1154,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; @@ -1147,8 +1166,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 */ @@ -1260,8 +1292,8 @@ AUPlugin::render_callback(AudioUnitRenderActionFlags*, { /* 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 bufs %3\n", - name(), inNumberFrames, ioData->mNumberBuffers)); + // DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1: render callback, frames %2 bufs %3\n", + // name(), inNumberFrames, ioData->mNumberBuffers)); if (input_maxbuf == 0) { error << _("AUPlugin: render callback called illegally!") << endmsg; @@ -1300,9 +1332,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; @@ -1310,10 +1347,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) { @@ -1321,8 +1354,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; } @@ -1357,8 +1392,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) { @@ -1414,13 +1449,13 @@ 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().divisions_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_bar_division; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCurrentBeat = beat; } @@ -1453,7 +1488,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) { @@ -1461,8 +1496,8 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe *outDeltaSampleOffsetToNextBeat = 0; } else { *outDeltaSampleOffsetToNextBeat = (UInt32) - floor (((Timecode::BBT_Time::ticks_per_bar_division - bbt.ticks)/Timecode::BBT_Time::ticks_per_bar_division) * // fraction of a beat to next beat - metric.tempo().frames_per_beat(_session.frame_rate(), metric.meter())); // frames per beat + 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 } } @@ -1548,24 +1583,24 @@ 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().divisions_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_bar_division; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCycleStartBeat = beat; } 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().divisions_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_bar_division; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCycleEndBeat = beat; } @@ -1637,8 +1672,6 @@ void AUPlugin::add_state (XMLNode* root) const { LocaleGuard lg (X_("POSIX")); - -#ifdef AU_STATE_SUPPORT CFDataRef xmlData; CFPropertyListRef propertyList; @@ -1670,20 +1703,11 @@ AUPlugin::add_state (XMLNode* root) const CFRelease (xmlData); CFRelease (propertyList); -#else - if (!seen_get_state_message) { - info << string_compose (_("Saving AudioUnit settings is not supported in this build of %1. Consider paying for a newer version"), - PROGRAM_NAME) - << endmsg; - seen_get_state_message = true; - } -#endif } int AUPlugin::set_state(const XMLNode& node, int version) { -#ifdef AU_STATE_SUPPORT int ret = -1; CFPropertyListRef propertyList; LocaleGuard lg (X_("POSIX")); @@ -1731,14 +1755,6 @@ AUPlugin::set_state(const XMLNode& node, int version) Plugin::set_state (node, version); return ret; -#else - if (!seen_set_state_message) { - info << string_compose (_("Restoring AudioUnit settings is not supported in this build of %1. Consider paying for a newer version"), - PROGRAM_NAME) - << endmsg; - } - return Plugin::set_state (node, version); -#endif } bool @@ -1746,7 +1762,6 @@ AUPlugin::load_preset (PresetRecord r) { Plugin::load_preset (r); -#ifdef AU_STATE_SUPPORT bool ret = false; CFPropertyListRef propertyList; Glib::ustring path; @@ -1794,15 +1809,6 @@ AUPlugin::load_preset (PresetRecord r) } return ret; -#else - if (!seen_loading_message) { - info << string_compose (_("Loading AudioUnit presets is not supported in this build of %1. Consider paying for a newer version"), - PROGRAM_NAME) - << endmsg; - seen_loading_message = true; - } - return true; -#endif } void @@ -1813,7 +1819,6 @@ AUPlugin::do_remove_preset (std::string) string AUPlugin::do_save_preset (string preset_name) { -#ifdef AU_STATE_SUPPORT CFPropertyListRef propertyList; vector v; Glib::ustring user_preset_path; @@ -1862,15 +1867,6 @@ AUPlugin::do_save_preset (string preset_name) CFRelease(propertyList); return string ("file:///") + user_preset_path; -#else - if (!seen_saving_message) { - info << string_compose (_("Saving AudioUnit presets is not supported in this build of %1. Consider paying for a newer version"), - PROGRAM_NAME) - << endmsg; - seen_saving_message = true; - } - return string(); -#endif } //----------------------------------------------------------------------------- @@ -2037,7 +2033,6 @@ AUPlugin::current_preset() const { string preset_name; -#ifdef AU_STATE_SUPPORT CFPropertyListRef propertyList; DEBUG_TRACE (DEBUG::AudioUnits, "get current preset for current_preset()\n"); @@ -2045,14 +2040,13 @@ AUPlugin::current_preset() const preset_name = get_preset_name_in_plist (propertyList); CFRelease(propertyList); } -#endif + return preset_name; } void AUPlugin::find_presets () { -#ifdef AU_STATE_SUPPORT vector* preset_files; PathScanner scanner; @@ -2099,10 +2093,8 @@ 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 } bool @@ -2155,7 +2147,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* @@ -2715,6 +2707,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; } @@ -2737,6 +2749,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; } @@ -2749,9 +2781,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; + } }