X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fplugin_insert.cc;h=9a0e6c55c40574e32cd001bf5e3df688593e625c;hp=19c661287fba38d1e25dd9a070c90f999eb31a48;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=6e94b1fb9f79c5bfcf22cd5b88619afa9bedb1b2 diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 19c661287f..9a0e6c55c4 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -36,6 +36,7 @@ #include "ardour/luaproc.h" #include "ardour/plugin.h" #include "ardour/plugin_insert.h" +#include "ardour/port.h" #ifdef LV2_SUPPORT #include "ardour/lv2_plugin.h" @@ -56,7 +57,7 @@ #include "ardour/session.h" #include "ardour/types.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -66,6 +67,9 @@ const string PluginInsert::port_automation_node_name = "PortAutomation"; PluginInsert::PluginInsert (Session& s, boost::shared_ptr plug) : Processor (s, (plug ? plug->name() : string ("toBeRenamed"))) + , _sc_playback_latency (0) + , _sc_capture_latency (0) + , _plugin_signal_latency (0) , _signal_analysis_collected_nframes(0) , _signal_analysis_collect_nframes_max(0) , _configured (false) @@ -73,6 +77,7 @@ PluginInsert::PluginInsert (Session& s, boost::shared_ptr plug) , _strict_io (false) , _custom_cfg (false) , _maps_from_state (false) + , _bypass_port (UINT32_MAX) { /* the first is the master */ @@ -80,8 +85,8 @@ PluginInsert::PluginInsert (Session& s, boost::shared_ptr plug) add_plugin (plug); create_automatable_parameters (); const ChanCount& sc (sidechain_input_pins ()); - if (sc.n_audio () > 0) { - add_sidechain (sc.n_audio ()); + if (sc.n_audio () > 0 || sc.n_midi () > 0) { + add_sidechain (sc.n_audio (), sc.n_midi ()); } } } @@ -105,9 +110,14 @@ PluginInsert::set_count (uint32_t num) { bool require_state = !_plugins.empty(); + if (require_state && num > 1 && plugin (0)->get_info ()->type == ARDOUR::AudioUnit) { + // we don't allow to replicate AUs + return false; + } + /* this is a bad idea.... we shouldn't do this while active. - only a route holding their redirect_lock should be calling this - */ + * only a route holding their redirect_lock should be calling this + */ if (num == 0) { return false; @@ -141,6 +151,13 @@ PluginInsert::set_count (uint32_t num) } +void +PluginInsert::set_sinks (const ChanCount& c) +{ + _custom_sinks = c; + /* no signal, change will only be visible after re-config */ +} + void PluginInsert::set_outputs (const ChanCount& c) { @@ -173,14 +190,14 @@ PluginInsert::set_preset_out (const ChanCount& c) } bool -PluginInsert::add_sidechain (uint32_t n_audio) +PluginInsert::add_sidechain (uint32_t n_audio, uint32_t n_midi) { // caller must hold process lock if (_sidechain) { return false; } std::ostringstream n; - if (n_audio > 0) { + if (n_audio > 0 || n_midi > 0) { n << "Sidechain " << Session::next_name_id (); } else { n << "TO BE RESET FROM XML"; @@ -189,7 +206,10 @@ PluginInsert::add_sidechain (uint32_t n_audio) _sidechain = boost::shared_ptr (sc); _sidechain->activate (); for (uint32_t n = 0; n < n_audio; ++n) { - _sidechain->input()->add_port ("", owner()); // add a port, don't connect. + _sidechain->input()->add_port ("", owner(), DataType::AUDIO); // add a port, don't connect. + } + for (uint32_t n = 0; n < n_midi; ++n) { + _sidechain->input()->add_port ("", owner(), DataType::MIDI); // add a port, don't connect. } PluginConfigChanged (); /* EMIT SIGNAL */ return true; @@ -202,10 +222,30 @@ PluginInsert::del_sidechain () return false; } _sidechain.reset (); + _sc_playback_latency = 0; + _sc_capture_latency = 0; PluginConfigChanged (); /* EMIT SIGNAL */ return true; } +void +PluginInsert::set_sidechain_latency (uint32_t capture, uint32_t playback) +{ + if (_sidechain && + (_sc_playback_latency != playback || _sc_capture_latency != capture)) { + _sc_capture_latency = capture; + _sc_playback_latency = playback; + LatencyRange pl; pl.min = pl.max = playback; + LatencyRange cl; cl.min = cl.max = capture; + DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: capture %2 playback; %3\n", _sidechain->name (), capture, playback)); + PortSet& ps (_sidechain->input ()->ports ()); + for (PortSet::iterator p = ps.begin(); p != ps.end(); ++p) { + p->set_private_latency_range (pl, true); + p->set_private_latency_range (cl, false); + } + } +} + void PluginInsert::control_list_automation_state_changed (Evoral::Parameter which, AutoState s) { @@ -312,7 +352,7 @@ PluginInsert::natural_output_streams() const { #ifdef MIXBUS if (is_channelstrip ()) { - return _configured_out; + return ChanCount::min (_configured_out, ChanCount (DataType::AUDIO, 2)); } #endif return _plugins[0]->get_info()->n_outputs; @@ -323,7 +363,7 @@ PluginInsert::natural_input_streams() const { #ifdef MIXBUS if (is_channelstrip ()) { - return _configured_in; + return ChanCount::min (_configured_in, ChanCount (DataType::AUDIO, 2)); } #endif return _plugins[0]->get_info()->n_inputs; @@ -362,36 +402,87 @@ PluginInsert::needs_midi_input() const return pip->n_inputs.n_midi() != 0 && pip->n_outputs.n_audio() != 0; } +bool +PluginInsert::has_output_presets (ChanCount in, ChanCount out) +{ + if (!_configured && _plugins[0]->get_info ()->reconfigurable_io ()) { + // collect possible configurations, prefer given in/out + _plugins[0]->can_support_io_configuration (in, out); + } + + PluginOutputConfiguration ppc (_plugins[0]->possible_output ()); + + if (ppc.size () == 0) { + return false; + } + if (!strict_io () && ppc.size () == 1) { + return false; + } + + if (strict_io () && ppc.size () == 1) { + // "stereo" is currently preferred default for instruments + if (ppc.find (2) != ppc.end ()) { + return false; + } + } + if (!needs_midi_input ()) { + return false; + } + return true; +} + void PluginInsert::create_automatable_parameters () { assert (!_plugins.empty()); + boost::shared_ptr plugin = _plugins.front(); set a = _plugins.front()->automatable (); - for (set::iterator i = a.begin(); i != a.end(); ++i) { - if (i->type() == PluginAutomation) { + for (uint32_t i = 0; i < plugin->parameter_count(); ++i) { + if (!plugin->parameter_is_control (i) || !plugin->parameter_is_input (i)) { + continue; + } + Evoral::Parameter param (PluginAutomation, 0, i); - Evoral::Parameter param(*i); + ParameterDescriptor desc; + plugin->get_parameter_descriptor(i, desc); - ParameterDescriptor desc; - _plugins.front()->get_parameter_descriptor(i->id(), desc); + const bool automatable = a.find(param) != a.end(); + if (automatable) { can_automate (param); - boost::shared_ptr list(new AutomationList(param, desc)); - boost::shared_ptr c (new PluginControl(this, param, desc, list)); - add_control (c); - _plugins.front()->set_automation_control (i->id(), c); - } else if (i->type() == PluginPropertyAutomation) { - Evoral::Parameter param(*i); - const ParameterDescriptor& desc = _plugins.front()->get_property_descriptor(param.id()); - if (desc.datatype != Variant::NOTHING) { - boost::shared_ptr list; - if (Variant::type_is_numeric(desc.datatype)) { - list = boost::shared_ptr(new AutomationList(param, desc)); - } - add_control (boost::shared_ptr (new PluginPropertyControl(this, param, desc, list))); + } + boost::shared_ptr list(new AutomationList(param, desc)); + boost::shared_ptr c (new PluginControl(this, param, desc, list)); + if (!automatable) { + c->set_flags (Controllable::Flag ((int)c->flags() | Controllable::NotAutomatable)); + } + add_control (c); + plugin->set_automation_control (i, c); + } + + + const Plugin::PropertyDescriptors& pdl (plugin->get_supported_properties ()); + for (Plugin::PropertyDescriptors::const_iterator p = pdl.begin(); p != pdl.end(); ++p) { + Evoral::Parameter param (PluginPropertyAutomation, 0, p->first); + const ParameterDescriptor& desc = plugin->get_property_descriptor(param.id()); + if (desc.datatype != Variant::NOTHING) { + boost::shared_ptr list; + if (Variant::type_is_numeric(desc.datatype)) { + list = boost::shared_ptr(new AutomationList(param, desc)); } + add_control (boost::shared_ptr (new PluginPropertyControl(this, param, desc, list))); + } + } + + _bypass_port = plugin->designated_bypass_port (); + + if (_bypass_port != UINT32_MAX) { + boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port)); + if (0 == (ac->flags () & Controllable::NotAutomatable)) { + ac->alist()->automation_state_changed.connect_same_thread (*this, boost::bind (&PluginInsert::bypassable_changed, this)); + ac->Changed.connect_same_thread (*this, boost::bind (&PluginInsert::enable_changed, this)); } } } @@ -464,6 +555,17 @@ PluginInsert::activate () } Processor::activate (); + /* when setting state e.g ProcessorBox::paste_processor_state () + * the plugin is not yet owned by a route. + * but no matter. Route::add_processors() will call activate () again + */ + if (!owner ()) { + return; + } + if (_plugin_signal_latency != signal_latency ()) { + _plugin_signal_latency = signal_latency (); + latency_changed (); + } } void @@ -474,6 +576,10 @@ PluginInsert::deactivate () for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) { (*i)->deactivate (); } + if (_plugin_signal_latency != signal_latency ()) { + _plugin_signal_latency = signal_latency (); + latency_changed (); + } } void @@ -485,7 +591,94 @@ PluginInsert::flush () } void -PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t offset, bool with_auto, framepos_t now) +PluginInsert::enable (bool yn) +{ + if (_bypass_port == UINT32_MAX) { + if (yn) { + activate (); + } else { + deactivate (); + } + } else { + if (!_pending_active) { + activate (); + } + boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port)); + ac->set_value (yn ? 1.0 : 0.0, Controllable::NoGroup); + ActiveChanged (); + } +} + +bool +PluginInsert::enabled () const +{ + if (_bypass_port == UINT32_MAX) { + return Processor::enabled (); + } else { + boost::shared_ptr ac = boost::const_pointer_cast (automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port))); + return (ac->get_value () > 0 && _pending_active); + } +} + +bool +PluginInsert::bypassable () const +{ + if (_bypass_port == UINT32_MAX) { + return true; + } else { + boost::shared_ptr ac = boost::const_pointer_cast (automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port))); + + return !ac->automation_playback (); + } +} + +void +PluginInsert::enable_changed () +{ + ActiveChanged (); +} + +void +PluginInsert::bypassable_changed () +{ + BypassableChanged (); +} + +void +PluginInsert::inplace_silence_unconnected (BufferSet& bufs, const PinMappings& out_map, framecnt_t nframes, framecnt_t offset) const +{ + // TODO optimize: store "unconnected" in a fixed set. + // it only changes on reconfiguration. + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + for (uint32_t out = 0; out < bufs.count().get (*t); ++out) { + bool mapped = false; + if (*t == DataType::MIDI && out == 0 && has_midi_bypass ()) { + mapped = true; // in-place Midi bypass + } + for (uint32_t pc = 0; pc < get_count() && !mapped; ++pc) { + PinMappings::const_iterator i = out_map.find (pc); + if (i == out_map.end ()) { + continue; + } + const ChanMapping& outmap (i->second); + for (uint32_t o = 0; o < natural_output_streams().get (*t); ++o) { + bool valid; + uint32_t idx = outmap.get (*t, o, &valid); + if (valid && idx == out) { + mapped = true; + break; + } + } + } + if (!mapped) { + bufs.get (*t, out).silence (nframes, offset); + } + } + } +} + +void +PluginInsert::connect_and_run (BufferSet& bufs, framepos_t start, framepos_t end, double speed, pframes_t nframes, framecnt_t offset, bool with_auto) { // TODO: atomically copy maps & _no_inplace PinMappings in_map (_in_map); @@ -553,7 +746,7 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of if (c->list() && c->automation_playback()) { bool valid; - const float val = c->list()->rt_safe_eval (now, valid); + const float val = c->list()->rt_safe_eval (start, valid); if (valid) { /* This is the ONLY place where we are @@ -585,10 +778,10 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of //std::cerr << " streams " << internal_input_streams().n_audio() << std::endl; //std::cerr << "filling buffer with " << collect_signal_nframes << " frames at " << _signal_analysis_collected_nframes << std::endl; - _signal_analysis_inputs.set_count(internal_input_streams()); + _signal_analysis_inputs.set_count(input_streams()); - for (uint32_t i = 0; i < internal_input_streams().n_audio(); ++i) { - _signal_analysis_inputs.get_audio(i).read_from( + for (uint32_t i = 0; i < input_streams().n_audio(); ++i) { + _signal_analysis_inputs.get_audio(i).read_from ( bufs.get_audio(i), collect_signal_nframes, _signal_analysis_collected_nframes); // offset is for target buffer @@ -601,7 +794,7 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of ChanMapping mb_in_map (ChanCount::min (_configured_in, ChanCount (DataType::AUDIO, 2))); ChanMapping mb_out_map (ChanCount::min (_configured_out, ChanCount (DataType::AUDIO, 2))); - _plugins.front()->connect_and_run (bufs, mb_in_map, mb_out_map, nframes, offset); + _plugins.front()->connect_and_run (bufs, start, end, speed, mb_in_map, mb_out_map, nframes, offset); for (uint32_t out = _configured_in.n_audio (); out < bufs.count().get (DataType::AUDIO); ++out) { bufs.get (DataType::AUDIO, out).silence (nframes, offset); @@ -634,10 +827,18 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of for (uint32_t out = 0; out < bufs.count().get (*t); ++out) { bool valid; uint32_t in_idx = thru_map.get (*t, out, &valid); + uint32_t m = out + natural_input_streams ().get (*t); if (valid) { - uint32_t m = out + natural_input_streams ().get (*t); _delaybuffers.delay (*t, out, inplace_bufs.get (*t, m), bufs.get (*t, in_idx), nframes, offset, offset); used_outputs.set (*t, out, 1); // mark as used + } else { + used_outputs.get (*t, out, &valid); + if (valid) { + /* the plugin is expected to write here, but may not :( + * (e.g. drumgizmo w/o kit loaded) + */ + inplace_bufs.get (*t, m).silence (nframes); + } } } } @@ -669,7 +870,7 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of i_out_map.offset_to (*t, natural_input_streams ().get (*t)); } - if ((*i)->connect_and_run (inplace_bufs, i_in_map, i_out_map, nframes, offset)) { + if ((*i)->connect_and_run (inplace_bufs, start, end, speed, i_in_map, i_out_map, nframes, offset)) { deactivate (); } } @@ -699,34 +900,12 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of /* in-place processing */ uint32_t pc = 0; for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i, ++pc) { - if ((*i)->connect_and_run(bufs, in_map[pc], out_map[pc], nframes, offset)) { + if ((*i)->connect_and_run(bufs, start, end, speed, in_map[pc], out_map[pc], nframes, offset)) { deactivate (); } } - - // TODO optimize: store "unconnected" in a fixed set. - // it only changes on reconfiguration. - for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { - for (uint32_t out = 0; out < bufs.count().get (*t); ++out) { - bool mapped = false; - if (*t == DataType::MIDI && out == 0 && has_midi_bypass ()) { - mapped = true; // in-place Midi bypass - } - for (uint32_t pc = 0; pc < get_count() && !mapped; ++pc) { - for (uint32_t o = 0; o < natural_output_streams().get (*t); ++o) { - bool valid; - uint32_t idx = out_map[pc].get (*t, o, &valid); - if (valid && idx == out) { - mapped = true; - break; - } - } - } - if (!mapped) { - bufs.get (*t, out).silence (nframes, offset); - } - } - } + // now silence unconnected outputs + inplace_silence_unconnected (bufs, _out_map, nframes, offset); } if (collect_signal_nframes > 0) { @@ -734,9 +913,9 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of //std::cerr << " output, bufs " << bufs.count().n_audio() << " count, " << bufs.available().n_audio() << " available" << std::endl; //std::cerr << " streams " << internal_output_streams().n_audio() << std::endl; - _signal_analysis_outputs.set_count(internal_output_streams()); + _signal_analysis_outputs.set_count(output_streams()); - for (uint32_t i = 0; i < internal_output_streams().n_audio(); ++i) { + for (uint32_t i = 0; i < output_streams().n_audio(); ++i) { _signal_analysis_outputs.get_audio(i).read_from( bufs.get_audio(i), collect_signal_nframes, @@ -754,72 +933,169 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of &_signal_analysis_outputs); } } + + if (_plugin_signal_latency != signal_latency ()) { + _plugin_signal_latency = signal_latency (); + latency_changed (); + } +} + +void +PluginInsert::bypass (BufferSet& bufs, pframes_t nframes) +{ + /* bypass the plugin(s) not the whole processor. + * -> use mappings just like connect_and_run + */ + + // TODO: atomically copy maps & _no_inplace + const ChanMapping in_map (no_sc_input_map ()); + const ChanMapping out_map (output_map ()); + if (_mapping_changed) { + _no_inplace = check_inplace (); + _mapping_changed = false; + } + + bufs.set_count(ChanCount::max(bufs.count(), _configured_internal)); + bufs.set_count(ChanCount::max(bufs.count(), _configured_out)); + + if (_no_inplace) { + ChanMapping thru_map (_thru_map); + + BufferSet& inplace_bufs = _session.get_noinplace_buffers(); + // copy all inputs + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + for (uint32_t in = 0; in < _configured_internal.get (*t); ++in) { + inplace_bufs.get (*t, in).read_from (bufs.get (*t, in), nframes, 0, 0); + } + } + ARDOUR::ChanMapping used_outputs; + // copy thru + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + for (uint32_t out = 0; out < _configured_out.get (*t); ++out) { + bool valid; + uint32_t in_idx = thru_map.get (*t, out, &valid); + if (valid) { + bufs.get (*t, out).read_from (inplace_bufs.get (*t, in_idx), nframes, 0, 0); + used_outputs.set (*t, out, 1); // mark as used + } + } + } + // plugin no-op: assume every plugin has an internal identity map + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + for (uint32_t out = 0; out < _configured_out.get (*t); ++out) { + bool valid; + uint32_t src_idx = out_map.get_src (*t, out, &valid); + if (!valid) { + continue; + } + uint32_t in_idx = in_map.get (*t, src_idx, &valid); + if (!valid) { + continue; + } + bufs.get (*t, out).read_from (inplace_bufs.get (*t, in_idx), nframes, 0, 0); + used_outputs.set (*t, out, 1); // mark as used + } + } + // now silence all unused outputs + if (has_midi_bypass ()) { + used_outputs.set (DataType::MIDI, 0, 1); // Midi bypass. + } + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + for (uint32_t out = 0; out < _configured_out.get (*t); ++out) { + bool valid; + used_outputs.get (*t, out, &valid); + if (!valid) { + bufs.get (*t, out).silence (nframes, 0); + } + } + } + } else { + if (_match.method == Split) { + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + if (_configured_internal.get (*t) == 0) { + continue; + } + // copy/feeds _all_ *connected* inputs, copy the first buffer + bool valid; + uint32_t first_idx = in_map.get (*t, 0, &valid); + assert (valid && first_idx == 0); // check_inplace ensures this + for (uint32_t i = 1; i < natural_input_streams ().get (*t); ++i) { + uint32_t idx = in_map.get (*t, i, &valid); + if (valid) { + assert (idx == 0); + bufs.get (*t, i).read_from (bufs.get (*t, first_idx), nframes, 0, 0); + } + } + } + } + + // apply output map and/or monotonic but not identity i/o mappings + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + for (uint32_t out = 0; out < _configured_out.get (*t); ++out) { + bool valid; + uint32_t src_idx = out_map.get_src (*t, out, &valid); + if (!valid) { + bufs.get (*t, out).silence (nframes, 0); + continue; + } + uint32_t in_idx = in_map.get (*t, src_idx, &valid); + if (!valid) { + bufs.get (*t, out).silence (nframes, 0); + continue; + } + if (in_idx != src_idx) { + bufs.get (*t, out).read_from (bufs.get (*t, in_idx), nframes, 0, 0); + } + } + } + } } void -PluginInsert::silence (framecnt_t nframes) +PluginInsert::silence (framecnt_t nframes, framepos_t start_frame) { if (!active ()) { return; } + _delaybuffers.flush (); + ChanMapping in_map (natural_input_streams ()); ChanMapping out_map (natural_output_streams ()); - - // TODO run sidechain (delaylines) + ChanCount maxbuf = ChanCount::max (natural_input_streams (), natural_output_streams()); +#ifdef MIXBUS + if (is_channelstrip ()) { + if (_configured_in.n_audio() > 0) { + _plugins.front()->connect_and_run (_session.get_scratch_buffers (maxbuf, true), start_frame, start_frame + nframes, 1.0, in_map, out_map, nframes, 0); + } + } else +#endif for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) { - (*i)->connect_and_run (_session.get_scratch_buffers ((*i)->get_info()->n_inputs, true), in_map, out_map, nframes, 0); + (*i)->connect_and_run (_session.get_scratch_buffers (maxbuf, true), start_frame, start_frame + nframes, 1.0, in_map, out_map, nframes, 0); } } void -PluginInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool) +PluginInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool) { + if (_sidechain) { + // collect sidechain input for complete cycle (!) + // TODO we need delaylines here for latency compensation + _sidechain->run (bufs, start_frame, end_frame, speed, nframes, true); + } + if (_pending_active) { /* run as normal if we are active or moving from inactive to active */ - if (_sidechain) { - // collect sidechain input for complete cycle (!) - // TODO we need delaylines here for latency compensation - _sidechain->run (bufs, start_frame, end_frame, nframes, true); - } - if (_session.transport_rolling() || _session.bounce_processing()) { - automation_run (bufs, start_frame, nframes); + automation_run (bufs, start_frame, end_frame, speed, nframes); } else { - connect_and_run (bufs, nframes, 0, false); + connect_and_run (bufs, start_frame, end_frame, speed, nframes, 0, false); } } else { - // TODO use mapping in bypassed mode ?! - // -> do we bypass the processor or the plugin - - // TODO include sidechain?? - - uint32_t in = input_streams ().n_audio (); - uint32_t out = output_streams().n_audio (); - - if (has_no_audio_inputs() || in == 0) { - - /* silence all (audio) outputs. Should really declick - * at the transitions of "active" - */ - - for (uint32_t n = 0; n < out; ++n) { - bufs.get_audio (n).silence (nframes); - } - - } else if (out > in) { - - /* not active, but something has make up for any channel count increase - * for now , simply replicate last buffer - */ - for (uint32_t n = in; n < out; ++n) { - bufs.get_audio(n).read_from(bufs.get_audio(in - 1), nframes); - } - } - - bufs.count().set_audio (out); + bypass (bufs, nframes); + _delaybuffers.flush (); } _active = _pending_active; @@ -830,39 +1106,37 @@ PluginInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame } void -PluginInsert::automation_run (BufferSet& bufs, framepos_t start, pframes_t nframes) +PluginInsert::automation_run (BufferSet& bufs, framepos_t start, framepos_t end, double speed, pframes_t nframes) { Evoral::ControlEvent next_event (0, 0.0f); - framepos_t now = start; - framepos_t end = now + nframes; framecnt_t offset = 0; Glib::Threads::Mutex::Lock lm (control_lock(), Glib::Threads::TRY_LOCK); if (!lm.locked()) { - connect_and_run (bufs, nframes, offset, false); + connect_and_run (bufs, start, end, speed, nframes, offset, false); return; } - if (!find_next_event (now, end, next_event) || _plugins.front()->requires_fixed_sized_buffers()) { + if (!find_next_event (start, end, next_event) || _plugins.front()->requires_fixed_sized_buffers()) { /* no events have a time within the relevant range */ - connect_and_run (bufs, nframes, offset, true, now); + connect_and_run (bufs, start, end, speed, nframes, offset, true); return; } while (nframes) { - framecnt_t cnt = min (((framecnt_t) ceil (next_event.when) - now), (framecnt_t) nframes); + framecnt_t cnt = min (((framecnt_t) ceil (next_event.when) - start), (framecnt_t) nframes); - connect_and_run (bufs, cnt, offset, true, now); + connect_and_run (bufs, start, start + cnt, speed, cnt, offset, true); // XXX (start + cnt) * speed nframes -= cnt; offset += cnt; - now += cnt; + start += cnt; - if (!find_next_event (now, end, next_event)) { + if (!find_next_event (start, end, next_event)) { break; } } @@ -870,7 +1144,7 @@ PluginInsert::automation_run (BufferSet& bufs, framepos_t start, pframes_t nfram /* cleanup anything that is left to do */ if (nframes) { - connect_and_run (bufs, nframes, offset, true, now); + connect_and_run (bufs, start, start + nframes, speed, nframes, offset, true); } } @@ -1039,6 +1313,20 @@ PluginInsert::set_thru_map (ChanMapping m) { } } +bool +PluginInsert::pre_seed (const ChanCount& in, const ChanCount& out, + const ChanMapping& im, const ChanMapping& om, const ChanMapping& tm) +{ + if (_configured) { return false; } + _configured_in = in; + _configured_out = out; + _in_map[0] = im; + _out_map[0] = om; + _thru_map = tm; + _maps_from_state = in.n_total () > 0 && out.n_total () > 0; + return true; +} + ChanMapping PluginInsert::input_map () const { @@ -1056,6 +1344,27 @@ PluginInsert::input_map () const return rv; } + +ChanMapping +PluginInsert::no_sc_input_map () const +{ + ChanMapping rv; + uint32_t pc = 0; + for (PinMappings::const_iterator i = _in_map.begin (); i != _in_map.end (); ++i, ++pc) { + ChanMapping m (i->second); + const ChanMapping::Mappings& mp ((*i).second.mappings()); + for (ChanMapping::Mappings::const_iterator tm = mp.begin(); tm != mp.end(); ++tm) { + uint32_t ins = natural_input_streams().get(tm->first) - _cached_sidechain_pins.get(tm->first); + for (ChanMapping::TypeMapping::const_iterator i = tm->second.begin(); i != tm->second.end(); ++i) { + if (i->first < ins) { + rv.set (tm->first, i->first + pc * ins, i->second); + } + } + } + } + return rv; +} + ChanMapping PluginInsert::output_map () const { @@ -1163,6 +1472,30 @@ PluginInsert::check_inplace () inplace_ok = false; } } + + if (inplace_ok) { + /* check if every output is fed by the corresponding input + * + * this prevents in-port 1 -> sink-pin 2 || source-pin 1 -> out port 1, source-pin 2 -> out port 2 + * (with in-place, source-pin 1 -> out port 1 overwrites in-port 1) + * + * but allows in-port 1 -> sink-pin 2 || source-pin 2 -> out port 1 + */ + ChanMapping in_map (input_map ()); + const ChanMapping::Mappings out_m (output_map ().mappings ()); + for (ChanMapping::Mappings::const_iterator t = out_m.begin (); t != out_m.end () && inplace_ok; ++t) { + for (ChanMapping::TypeMapping::const_iterator c = (*t).second.begin (); c != (*t).second.end () ; ++c) { + /* src-pin: c->first, out-port: c->second */ + bool valid; + uint32_t in_port = in_map.get (t->first, c->first, &valid); + if (valid && in_port != c->second) { + inplace_ok = false; + break; + } + } + } + } + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: %2\n", name(), inplace_ok ? "In-Place" : "No Inplace Processing")); return !inplace_ok; // no-inplace } @@ -1351,12 +1684,12 @@ PluginInsert::configure_io (ChanCount in, ChanCount out) ChanCount old_in; ChanCount old_internal; ChanCount old_out; + ChanCount old_pins; - if (_configured) { - old_in = _configured_in; - old_internal = _configured_internal; - old_out = _configured_out; - } + old_pins = natural_input_streams(); + old_in = _configured_in; + old_out = _configured_out; + old_internal = _configured_internal; _configured_in = in; _configured_internal = in; @@ -1372,6 +1705,9 @@ PluginInsert::configure_io (ChanCount in, ChanCount out) return false; } _configured_internal += _sidechain->input()->n_ports(); + + // include (static_castowner())->name() ?? + _sidechain->input ()-> set_pretty_name (string_compose (_("SC %1"), name ())); } /* get plugin configuration */ @@ -1379,7 +1715,7 @@ PluginInsert::configure_io (ChanCount in, ChanCount out) #ifndef NDEBUG if (DEBUG_ENABLED(DEBUG::ChanMapping)) { DEBUG_STR_DECL(a); - DEBUG_STR_APPEND(a, string_compose ("Match '%1': ", name())); + DEBUG_STR_APPEND(a, string_compose ("%1: ", name())); DEBUG_STR_APPEND(a, _match); DEBUG_TRACE (DEBUG::ChanMapping, DEBUG_STR(a).str()); } @@ -1404,8 +1740,12 @@ PluginInsert::configure_io (ChanCount in, ChanCount out) break; case Delegate: { - ChanCount dout (in); // hint - if (_custom_cfg) { + ChanCount din (_configured_internal); + ChanCount dout (din); // hint + if (_custom_cfg) { + if (_custom_sinks.n_total () > 0) { + din = _custom_sinks; + } dout = _custom_out; } else if (_preset_out.n_audio () > 0) { dout.set (DataType::AUDIO, _preset_out.n_audio ()); @@ -1414,18 +1754,22 @@ PluginInsert::configure_io (ChanCount in, ChanCount out) } if (out.n_audio () == 0) { out.set (DataType::AUDIO, 1); } ChanCount useins; - bool const r = _plugins.front()->can_support_io_configuration (in, dout, &useins); + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: Delegate lookup : %2 %3\n", name(), din, dout)); + bool const r = _plugins.front()->can_support_io_configuration (din, dout, &useins); assert (r); if (useins.n_audio() == 0) { - useins = in; + useins = din; } - DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("Delegate configuration: %1 %2 %3\n", name(), useins, dout)); + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: Delegate configuration: %2 %3\n", name(), useins, dout)); if (_plugins.front()->configure_io (useins, dout) == false) { PluginIoReConfigure (); /* EMIT SIGNAL */ _configured = false; return false; } + if (!_custom_cfg) { + _custom_sinks = din; + } } break; default: @@ -1437,31 +1781,62 @@ PluginInsert::configure_io (ChanCount in, ChanCount out) break; } + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: cfg:%2 state:%3 chn-in:%4 chn-out:%5 inpin:%6 match:%7 cust:%8 size-in:%9 size-out:%10\n", + name (), + _configured ? "Y" : "N", + _maps_from_state ? "Y" : "N", + old_in == in ? "==" : "!=", + old_out == out ? "==" : "!=", + old_pins == natural_input_streams () ? "==" : "!=", + old_match.method == _match.method ? "==" : "!=", + old_match.custom_cfg == _match.custom_cfg ? "==" : "!=", + _in_map.size() == get_count () ? "==" : "!=", + _out_map.size() == get_count () ? "==" : "!=" + )); + bool mapping_changed = false; if (old_in == in && old_out == out && _configured + && old_pins == natural_input_streams () && old_match.method == _match.method + && old_match.custom_cfg == _match.custom_cfg && _in_map.size() == _out_map.size() && _in_map.size() == get_count () ) { + assert (_maps_from_state == false); /* If the configuration has not changed, keep the mapping */ - if (old_internal != _configured_internal) { - mapping_changed = sanitize_maps (); - } + mapping_changed = sanitize_maps (); } else if (_match.custom_cfg && _configured) { + assert (_maps_from_state == false); + /* don't touch the map in manual mode */ mapping_changed = sanitize_maps (); } else { #ifdef MIXBUS - if (is_channelstrip ()) { _maps_from_state = false; } + if (is_channelstrip ()) { + /* fake channel map - for wire display */ + _in_map.clear (); + _out_map.clear (); + _thru_map = ChanMapping (); + _in_map[0] = ChanMapping (ChanCount::min (_configured_in, ChanCount (DataType::AUDIO, 2))); + _out_map[0] = ChanMapping (ChanCount::min (_configured_out, ChanCount (DataType::AUDIO, 2))); + /* set "thru" map for in-place forward of audio */ + for (uint32_t i = 2; i < _configured_in.n_audio(); ++i) { + _thru_map.set (DataType::AUDIO, i, i); + } + /* and midi (after implicit 1st channel bypass) */ + for (uint32_t i = 1; i < _configured_in.n_midi(); ++i) { + _thru_map.set (DataType::MIDI, i, i); + } + } else #endif - if (_maps_from_state) { - _maps_from_state = false; + if (_maps_from_state && old_in == in && old_out == out) { mapping_changed = true; sanitize_maps (); } else { /* generate a new mapping */ mapping_changed = reset_map (false); } + _maps_from_state = false; } if (mapping_changed) { @@ -1508,17 +1883,22 @@ PluginInsert::configure_io (ChanCount in, ChanCount out) * * sidechain inputs add a constraint on the input: * configured input + sidechain (=_configured_internal) + * + * NB. this also satisfies + * max (natural_input_streams(), natural_output_streams()) + * which is needed for silence runs */ - _required_buffers =ChanCount::max (_configured_internal, + _required_buffers = ChanCount::max (_configured_internal, natural_input_streams () + ChanCount::max (_configured_out, natural_output_streams () * get_count ())); if (old_in != in || old_out != out || old_internal != _configured_internal + || old_pins != natural_input_streams () || (old_match.method != _match.method && (old_match.method == Split || _match.method == Split)) ) { PluginIoReConfigure (); /* EMIT SIGNAL */ } - _delaybuffers.configure (_configured_out, _plugins.front()->max_latency ()); + _delaybuffers.configure (_configured_out, _plugins.front ()->max_latency ()); _latency_changed = true; // we don't know the analysis window size, so we must work with the @@ -1526,10 +1906,10 @@ PluginInsert::configure_io (ChanCount in, ChanCount out) // buffers and the analyser makes sure it gets enough data for the // analysis window session().ensure_buffer_set (_signal_analysis_inputs, in); - //_signal_analysis_inputs.set_count (in); + _signal_analysis_inputs.set_count (in); session().ensure_buffer_set (_signal_analysis_outputs, out); - //_signal_analysis_outputs.set_count (out); + _signal_analysis_outputs.set_count (out); // std::cerr << "set counts to i" << in.n_audio() << "/o" << out.n_audio() << std::endl; @@ -1565,7 +1945,7 @@ PluginInsert::private_can_support_io_configuration (ChanCount const& in, ChanCou Match rv = internal_can_support_io_configuration (in, out); if (!_custom_cfg && _preset_out.n_audio () > 0) { - DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("using output preset: %1 %2\n", name(), _preset_out)); + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: using output preset: %2\n", name(), _preset_out)); out.set (DataType::AUDIO, _preset_out.n_audio ()); } return rv; @@ -1594,7 +1974,7 @@ PluginInsert::internal_can_support_io_configuration (ChanCount const & inx, Chan PluginInfoPtr info = _plugins.front()->get_info(); out = _custom_out; if (info->reconfigurable_io()) { - return Match (Delegate, get_count(), _strict_io, true); + return Match (Delegate, 1, _strict_io, true); } else { return Match (ExactMatch, get_count(), _strict_io, true); } @@ -1617,7 +1997,7 @@ PluginInsert::internal_can_support_io_configuration (ChanCount const & inx, Chan ChanCount max_out (DataType::AUDIO, 2); // TODO use master-out max_out.set (DataType::MIDI, out.get(DataType::MIDI)); out = ChanCount::min (out, max_out); - DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("special case strict-i/o instrument: %1\n", name())); + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: special case strict-i/o instrument\n", name())); return m; } @@ -1633,7 +2013,7 @@ PluginInsert::internal_can_support_io_configuration (ChanCount const & inx, Chan f = max (f, (uint32_t) ceil (inx.get(*t) / (float)nout)); } out = inx; - DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("special case strict-i/o generator: %1\n", name())); + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: special case strict-i/o for generator\n", name())); return Match (Replicate, f, _strict_io); } break; @@ -1651,18 +2031,20 @@ PluginInsert::internal_can_support_io_configuration (ChanCount const & inx, Chan ChanCount ns_inputs = inputs - sidechain_input_pins (); - DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("resolving 'Impossible' match for %1\n", name())); + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: resolving 'Impossible' match...\n", name())); if (info->reconfigurable_io()) { ChanCount useins; out = inx; // hint if (out.n_midi () > 0 && out.n_audio () == 0) { out.set (DataType::AUDIO, 2); } if (out.n_audio () == 0) { out.set (DataType::AUDIO, 1); } - bool const r = _plugins.front()->can_support_io_configuration (inx, out, &useins); + bool const r = _plugins.front()->can_support_io_configuration (inx + sidechain_input_pins (), out, &useins); if (!r) { // houston, we have a problem. return Match (Impossible, 0); } + // midi bypass + if (inx.n_midi () > 0 && out.n_midi () == 0) { out.set (DataType::MIDI, 1); } return Match (Delegate, 1, _strict_io); } @@ -1727,10 +2109,12 @@ PluginInsert::automatic_can_support_io_configuration (ChanCount const & inx, Cha out = in; // hint if (out.n_midi () > 0 && out.n_audio () == 0) { out.set (DataType::AUDIO, 2); } if (out.n_audio () == 0) { out.set (DataType::AUDIO, 1); } - bool const r = _plugins.front()->can_support_io_configuration (in, out); + bool const r = _plugins.front()->can_support_io_configuration (in + sidechain_input_pins (), out); if (!r) { return Match (Impossible, 0); } + // midi bypass + if (in.n_midi () > 0 && out.n_midi () == 0) { out.set (DataType::MIDI, 1); } return Match (Delegate, 1); } @@ -1739,11 +2123,11 @@ PluginInsert::automatic_can_support_io_configuration (ChanCount const & inx, Cha ChanCount ns_inputs = inputs - sidechain_input_pins (); if (in.get(DataType::MIDI) == 1 && outputs.get(DataType::MIDI) == 0) { - DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("bypassing midi-data around %1\n", name())); + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: bypassing midi-data\n", name())); midi_bypass.set (DataType::MIDI, 1); } if (in.get(DataType::MIDI) == 1 && inputs.get(DataType::MIDI) == 0) { - DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("hiding midi-port from plugin %1\n", name())); + DEBUG_TRACE (DEBUG::ChanMapping, string_compose ("%1: hiding midi-port from plugin\n", name())); in.set(DataType::MIDI, 0); } @@ -1784,7 +2168,7 @@ PluginInsert::automatic_can_support_io_configuration (ChanCount const & inx, Cha uint32_t f = 0; bool can_replicate = true; - for (DataType::iterator t = DataType::begin(); t != DataType::end() && can_replicate; ++t) { + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { // ignore side-chains uint32_t nin = ns_inputs.get (*t); @@ -1889,6 +2273,7 @@ PluginInsert::state (bool full) /* remember actual i/o configuration (for later placeholder * in case the plugin goes missing) */ node.add_child_nocopy (* _configured_in.state (X_("ConfiguredInput"))); + node.add_child_nocopy (* _custom_sinks.state (X_("CustomSinks"))); node.add_child_nocopy (* _configured_out.state (X_("ConfiguredOutput"))); node.add_child_nocopy (* _preset_out.state (X_("PresetOutput"))); @@ -1929,7 +2314,7 @@ PluginInsert::set_control_ids (const XMLNode& node, int version) for (iter = nlist.begin(); iter != nlist.end(); ++iter) { if ((*iter)->name() == Controllable::xml_node_name) { - const XMLProperty* prop; + XMLProperty const * prop; uint32_t p = (uint32_t)-1; #ifdef LV2_SUPPORT @@ -1970,7 +2355,7 @@ PluginInsert::set_state(const XMLNode& node, int version) XMLNodeList nlist = node.children(); XMLNodeIterator niter; XMLPropertyList plist; - const XMLProperty *prop; + XMLProperty const * prop; ARDOUR::PluginType type; if ((prop = node.property ("type")) == 0) { @@ -2042,6 +2427,19 @@ PluginInsert::set_state(const XMLNode& node, int version) } #endif + if (plugin == 0 && type == ARDOUR::Lua) { + /* unique ID (sha1 of script) was not found, + * load the plugin from the serialized version in the + * session-file instead. + */ + boost::shared_ptr lp (new LuaProc (_session.engine(), _session, "")); + XMLNode *ls = node.child (lp->state_node_name().c_str()); + if (ls && lp) { + lp->set_script_from_state (*ls); + plugin = lp; + } + } + if (plugin == 0) { error << string_compose( _("Found a reference to a plugin (\"%1\") that is unknown.\n" @@ -2051,15 +2449,6 @@ PluginInsert::set_state(const XMLNode& node, int version) return -1; } - if (type == ARDOUR::Lua) { - XMLNode *ls = node.child (plugin->state_node_name().c_str()); - // we need to load the script to set the name and parameters. - boost::shared_ptr lp = boost::dynamic_pointer_cast(plugin); - if (ls && lp) { - lp->set_script_from_state (*ls); - } - } - // The name of the PluginInsert comes from the plugin, nothing else _name = plugin->get_info()->name; @@ -2161,22 +2550,29 @@ PluginInsert::set_state(const XMLNode& node, int version) uint32_t out_maps = 0; XMLNodeList kids = node.children (); for (XMLNodeIterator i = kids.begin(); i != kids.end(); ++i) { + if ((*i)->name() == X_("ConfiguredInput")) { + _configured_in = ChanCount(**i); + } + if ((*i)->name() == X_("CustomSinks")) { + _custom_sinks = ChanCount(**i); + } if ((*i)->name() == X_("ConfiguredOutput")) { _custom_out = ChanCount(**i); + _configured_out = ChanCount(**i); } if ((*i)->name() == X_("PresetOutput")) { _preset_out = ChanCount(**i); } if (strncmp ((*i)->name ().c_str(), X_("InputMap-"), 9) == 0) { long pc = atol (&((*i)->name().c_str()[9])); - if (pc >=0 && pc <= get_count()) { + if (pc >= 0 && pc <= (long) get_count()) { _in_map[pc] = ChanMapping (**i); ++in_maps; } } if (strncmp ((*i)->name ().c_str(), X_("OutputMap-"), 10) == 0) { long pc = atol (&((*i)->name().c_str()[10])); - if (pc >=0 && pc <= get_count()) { + if (pc >= 0 && pc <= (long) get_count()) { _out_map[pc] = ChanMapping (**i); ++out_maps; } @@ -2241,7 +2637,7 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version) } XMLNodeList cnodes; - XMLProperty *cprop; + XMLProperty const * cprop; XMLNodeConstIterator iter; XMLNode *child; const char *port; @@ -2327,6 +2723,9 @@ PluginInsert::describe_parameter (Evoral::Parameter param) ARDOUR::framecnt_t PluginInsert::signal_latency() const { + if (!_pending_active) { + return 0; + } if (_user_latency) { return _user_latency; } @@ -2353,29 +2752,12 @@ PluginInsert::PluginControl::PluginControl (PluginInsert* p, list->set_interpolation(Evoral::ControlList::Discrete); } } - - if (desc.toggled) { - set_flags(Controllable::Toggle); - } } /** @param val `user' value */ -void -PluginInsert::PluginControl::set_value (double user_val, PBD::Controllable::GroupControlDisposition group_override) -{ - if (writable()) { - _set_value (user_val, group_override); - } -} -void -PluginInsert::PluginControl::set_value_unchecked (double user_val) -{ - /* used only by automation playback */ - _set_value (user_val, Controllable::NoGroup); -} void -PluginInsert::PluginControl::_set_value (double user_val, PBD::Controllable::GroupControlDisposition group_override) +PluginInsert::PluginControl::actually_set_value (double user_val, PBD::Controllable::GroupControlDisposition group_override) { /* FIXME: probably should be taking out some lock here.. */ @@ -2388,13 +2770,13 @@ PluginInsert::PluginControl::_set_value (double user_val, PBD::Controllable::Gro iasp->set_parameter (_list->parameter().id(), user_val); } - AutomationControl::set_value (user_val, group_override); + AutomationControl::actually_set_value (user_val, group_override); } void PluginInsert::PluginControl::catch_up_with_external_value (double user_val) { - AutomationControl::set_value (user_val, Controllable::NoGroup); + AutomationControl::actually_set_value (user_val, Controllable::NoGroup); } XMLNode& @@ -2439,22 +2821,10 @@ PluginInsert::PluginPropertyControl::PluginPropertyControl (PluginInsert* alist()->set_yrange (desc.lower, desc.upper); alist()->reset_default (desc.normal); } - - if (desc.toggled) { - set_flags(Controllable::Toggle); - } } void -PluginInsert::PluginPropertyControl::set_value (double user_val, PBD::Controllable::GroupControlDisposition /* group_override*/) -{ - if (writable()) { - set_value_unchecked (user_val); - } -} - -void -PluginInsert::PluginPropertyControl::set_value_unchecked (double user_val) +PluginInsert::PluginPropertyControl::actually_set_value (double user_val, Controllable::GroupControlDisposition gcd) { /* Old numeric set_value(), coerce to appropriate datatype if possible. This is lossy, but better than nothing until Ardour's automation system @@ -2470,7 +2840,8 @@ PluginInsert::PluginPropertyControl::set_value_unchecked (double user_val) } _value = value; - AutomationControl::set_value (user_val, Controllable::NoGroup); + + AutomationControl::actually_set_value (user_val, gcd); } XMLNode& @@ -2497,8 +2868,18 @@ PluginInsert::get_impulse_analysis_plugin() { boost::shared_ptr ret; if (_impulseAnalysisPlugin.expired()) { + // LV2 in particular uses various _session params + // during init() -- most notably block_size.. + // not great. ret = plugin_factory(_plugins[0]); - ret->configure_io (internal_input_streams (), internal_output_streams ()); + ChanCount out (internal_output_streams ()); + if (ret->get_info ()->reconfigurable_io ()) { + // populate get_info ()->n_inputs and ->n_outputs + ChanCount useins; + ret->can_support_io_configuration (internal_input_streams (), out, &useins); + assert (out == internal_output_streams ()); + } + ret->configure_io (internal_input_streams (), out); _impulseAnalysisPlugin = ret; } else { ret = _impulseAnalysisPlugin.lock(); @@ -2512,8 +2893,8 @@ PluginInsert::collect_signal_for_analysis (framecnt_t nframes) { // called from outside the audio thread, so this should be safe // only do audio as analysis is (currently) only for audio plugins - _signal_analysis_inputs.ensure_buffers( DataType::AUDIO, internal_input_streams().n_audio(), nframes); - _signal_analysis_outputs.ensure_buffers( DataType::AUDIO, internal_output_streams().n_audio(), nframes); + _signal_analysis_inputs.ensure_buffers (DataType::AUDIO, input_streams().n_audio(), nframes); + _signal_analysis_outputs.ensure_buffers (DataType::AUDIO, output_streams().n_audio(), nframes); _signal_analysis_collected_nframes = 0; _signal_analysis_collect_nframes_max = nframes; @@ -2531,7 +2912,7 @@ PluginInsert::add_plugin (boost::shared_ptr plugin) plugin->ParameterChangedExternally.connect_same_thread (*this, boost::bind (&PluginInsert::parameter_changed_externally, this, _1, _2)); plugin->StartTouch.connect_same_thread (*this, boost::bind (&PluginInsert::start_touch, this, _1)); plugin->EndTouch.connect_same_thread (*this, boost::bind (&PluginInsert::end_touch, this, _1)); - plugin->LatencyChanged.connect_same_thread (*this, boost::bind (&PluginInsert::latency_changed, this, _1, _2)); + _custom_sinks = plugin->get_info()->n_inputs; // cache sidechain port count _cached_sidechain_pins.reset (); const ChanCount& nis (plugin->get_info()->n_inputs); @@ -2550,9 +2931,22 @@ PluginInsert::add_plugin (boost::shared_ptr plugin) vst->set_insert (this, _plugins.size ()); } #endif + _plugins.push_back (plugin); } +bool +PluginInsert::load_preset (ARDOUR::Plugin::PresetRecord pr) +{ + bool ok = true; + for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) { + if (! (*i)->load_preset (pr)) { + ok = false; + } + } + return ok; +} + void PluginInsert::realtime_handle_transport_stopped () { @@ -2578,10 +2972,13 @@ PluginInsert::monitoring_changed () } void -PluginInsert::latency_changed (framecnt_t, framecnt_t) +PluginInsert::latency_changed () { // this is called in RT context, LatencyChanged is emitted after run() _latency_changed = true; + // XXX This also needs a proper API not an owner() hack. + assert (owner ()); + static_cast(owner ())->processor_latency_changed (); /* EMIT SIGNAL */ } void