X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplugin_insert.cc;h=205262ab4c56e0edac9af322c2295b148b8484ba;hb=79f01bc889d6c928345214eaba9016c6396bcfca;hp=8e3e1382012eb1853fa43fa1c43f8fd7a536a88f;hpb=e6f4f179be87758a16d4f1a11e9cd8de74970e63;p=ardour.git diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 8e3e138201..205262ab4c 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -25,7 +25,7 @@ #include "pbd/failed_constructor.h" #include "pbd/xml++.h" -#include "pbd/convert.h" +#include "pbd/types_convert.h" #include "ardour/audio_buffer.h" #include "ardour/automation_list.h" @@ -83,6 +83,7 @@ PluginInsert::PluginInsert (Session& s, boost::shared_ptr plug) , _maps_from_state (false) , _latency_changed (false) , _bypass_port (UINT32_MAX) + , _stat_reset (0) { /* the first is the master */ @@ -98,6 +99,9 @@ PluginInsert::PluginInsert (Session& s, boost::shared_ptr plug) PluginInsert::~PluginInsert () { + for (CtrlOutMap::const_iterator i = _control_outputs.begin(); i != _control_outputs.end(); ++i) { + boost::dynamic_pointer_cast(i->second)->drop_references (); + } } void @@ -233,24 +237,6 @@ PluginInsert::del_sidechain () 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) { @@ -261,7 +247,7 @@ PluginInsert::control_list_automation_state_changed (Evoral::Parameter which, Au = boost::dynamic_pointer_cast(control (which)); if (c && s != Off) { - _plugins[0]->set_parameter (which.id(), c->list()->eval (_session.transport_frame())); + _plugins[0]->set_parameter (which.id(), c->list()->eval (_session.transport_sample())); } } @@ -392,7 +378,7 @@ PluginInsert::has_no_audio_inputs() const return _plugins[0]->get_info()->n_inputs.n_audio() == 0; } -framecnt_t +samplecnt_t PluginInsert::plugin_latency () const { return _plugins.front()->signal_latency (); } @@ -401,10 +387,7 @@ bool PluginInsert::is_instrument() const { PluginInfoPtr pip = _plugins[0]->get_info(); - if (pip->is_instrument ()) { - return true; - } - return pip->n_inputs.n_midi () != 0 && pip->n_outputs.n_audio () > 0 && pip->n_inputs.n_audio () == 0; + return (pip->is_instrument ()); } bool @@ -452,14 +435,19 @@ PluginInsert::create_automatable_parameters () set a = _plugins.front()->automatable (); for (uint32_t i = 0; i < plugin->parameter_count(); ++i) { - if (!plugin->parameter_is_control (i) || !plugin->parameter_is_input (i)) { + if (!plugin->parameter_is_control (i)) { continue; } - Evoral::Parameter param (PluginAutomation, 0, i); ParameterDescriptor desc; plugin->get_parameter_descriptor(i, desc); + if (!plugin->parameter_is_input (i)) { + _control_outputs[i] = boost::shared_ptr (new ReadOnlyControl (plugin, desc, i)); + continue; + } + Evoral::Parameter param (PluginAutomation, 0, i); + const bool automatable = a.find(param) != a.end(); if (automatable) { @@ -484,7 +472,11 @@ PluginInsert::create_automatable_parameters () 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 c (new PluginPropertyControl(this, param, desc, list)); + if (!Variant::type_is_numeric(desc.datatype)) { + c->set_flags (Controllable::Flag ((int)c->flags() | Controllable::NotAutomatable)); + } + add_control (c); } } @@ -576,9 +568,57 @@ PluginInsert::set_block_size (pframes_t nframes) return ret; } +void +PluginInsert::automation_run (samplepos_t start, pframes_t nframes) +{ + // XXX does not work when rolling backwards + if (_loop_location && nframes > 0) { + const samplepos_t loop_start = _loop_location->start (); + const samplepos_t loop_end = _loop_location->end (); + const samplecnt_t looplen = loop_end - loop_start; + + samplecnt_t remain = nframes; + samplepos_t start_pos = start; + + while (remain > 0) { + if (start_pos >= loop_end) { + sampleoffset_t start_off = (start_pos - loop_start) % looplen; + start_pos = loop_start + start_off; + } + samplecnt_t move = std::min ((samplecnt_t)nframes, loop_end - start_pos); + + Automatable::automation_run (start_pos, move); + remain -= move; + start_pos += move; + } + return; + } + Automatable::automation_run (start, nframes); +} + +bool +PluginInsert::find_next_event (double now, double end, Evoral::ControlEvent& next_event, bool only_active) const +{ + bool rv = Automatable::find_next_event (now, end, next_event, only_active); + + if (_loop_location && now < end) { + if (rv) { + end = ceil (next_event.when); + } + const samplepos_t loop_end = _loop_location->end (); + assert (now < loop_end); // due to map_loop_range () + if (end > loop_end) { + next_event.when = loop_end; + rv = true; + } + } + return rv; +} + void PluginInsert::activate () { + _timing_stats.reset (); for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) { (*i)->activate (); } @@ -600,6 +640,12 @@ PluginInsert::activate () void PluginInsert::deactivate () { +#ifdef MIXBUS + if (is_nonbypassable ()) { + return; + } +#endif + _timing_stats.reset (); Processor::deactivate (); for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) { @@ -633,7 +679,27 @@ PluginInsert::enable (bool yn) activate (); } boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port)); - ac->set_value (yn ? 1.0 : 0.0, Controllable::NoGroup); + const double val = yn ? 1.0 : 0.0; + ac->set_value (val, Controllable::NoGroup); + +#ifdef ALLOW_VST_BYPASS_TO_FAIL // yet unused, see also vst_plugin.cc + /* special case VST.. bypass may fail */ + if (_bypass_port == UINT32_MAX - 1) { + /* check if bypass worked */ + if (ac->get_value () != val) { + warning << _("PluginInsert: VST Bypass failed, falling back to host bypass.") << endmsg; + // set plugin to enabled (not-byassed) + ac->set_value (1.0, Controllable::NoGroup); + // ..and use host-provided hard-bypass + if (yn) { + activate (); + } else { + deactivate (); + } + return; + } + } +#endif ActiveChanged (); } } @@ -673,6 +739,18 @@ PluginInsert::bypassable_changed () BypassableChanged (); } +bool +PluginInsert::write_immediate_event (size_t size, const uint8_t* buf) +{ + bool rv = true; + for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) { + if (!(*i)->write_immediate_event (size, buf)) { + rv = false; + } + } + return rv; +} + void PluginInsert::preset_load_set_value (uint32_t p, float v) { @@ -691,7 +769,7 @@ PluginInsert::preset_load_set_value (uint32_t p, float v) } void -PluginInsert::inplace_silence_unconnected (BufferSet& bufs, const PinMappings& out_map, framecnt_t nframes, framecnt_t offset) const +PluginInsert::inplace_silence_unconnected (BufferSet& bufs, const PinMappings& out_map, samplecnt_t nframes, samplecnt_t offset) const { // TODO optimize: store "unconnected" in a fixed set. // it only changes on reconfiguration. @@ -724,7 +802,7 @@ PluginInsert::inplace_silence_unconnected (BufferSet& bufs, const PinMappings& o } void -PluginInsert::connect_and_run (BufferSet& bufs, framepos_t start, framepos_t end, double speed, pframes_t nframes, framecnt_t offset, bool with_auto) +PluginInsert::connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, pframes_t nframes, samplecnt_t offset, bool with_auto) { // TODO: atomically copy maps & _no_inplace PinMappings in_map (_in_map); @@ -811,10 +889,10 @@ PluginInsert::connect_and_run (BufferSet& bufs, framepos_t start, framepos_t end } } - /* Calculate if, and how many frames we need to collect for analysis */ - framecnt_t collect_signal_nframes = (_signal_analysis_collect_nframes_max - + /* Calculate if, and how many samples we need to collect for analysis */ + samplecnt_t collect_signal_nframes = (_signal_analysis_collect_nframes_max - _signal_analysis_collected_nframes); - if (nframes < collect_signal_nframes) { // we might not get all frames now + if (nframes < collect_signal_nframes) { // we might not get all samples now collect_signal_nframes = nframes; } @@ -822,7 +900,7 @@ PluginInsert::connect_and_run (BufferSet& bufs, framepos_t start, framepos_t end // collect input //std::cerr << "collect input, bufs " << bufs.count().n_audio() << " count, " << bufs.available().n_audio() << " available" << std::endl; //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; + //std::cerr << "filling buffer with " << collect_signal_nframes << " samples at " << _signal_analysis_collected_nframes << std::endl; _signal_analysis_inputs.set_count(input_streams()); @@ -1098,9 +1176,12 @@ PluginInsert::bypass (BufferSet& bufs, pframes_t nframes) } void -PluginInsert::silence (framecnt_t nframes, framepos_t start_frame) +PluginInsert::silence (samplecnt_t nframes, samplepos_t start_sample) { + automation_run (start_sample, nframes); // evaluate automation only + if (!active ()) { + // XXX delaybuffers need to be offset by nframes return; } @@ -1112,36 +1193,46 @@ PluginInsert::silence (framecnt_t nframes, framepos_t start_frame) #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); + _plugins.front()->connect_and_run (_session.get_scratch_buffers (maxbuf, true), start_sample, start_sample + 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 (maxbuf, true), start_frame, start_frame + nframes, 1.0, in_map, out_map, nframes, 0); + (*i)->connect_and_run (_session.get_scratch_buffers (maxbuf, true), start_sample, start_sample + nframes, 1.0, in_map, out_map, nframes, 0); } } void -PluginInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool) +PluginInsert::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, 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); + _sidechain->run (bufs, start_sample, end_sample, speed, nframes, true); + } + + if (g_atomic_int_compare_and_exchange (&_stat_reset, 1, 0)) { + _timing_stats.reset (); } if (_pending_active) { + _timing_stats.start (); /* run as normal if we are active or moving from inactive to active */ if (_session.transport_rolling() || _session.bounce_processing()) { - automation_run (bufs, start_frame, end_frame, speed, nframes); + automate_and_run (bufs, start_sample, end_sample, speed, nframes); } else { Glib::Threads::Mutex::Lock lm (control_lock(), Glib::Threads::TRY_LOCK); - connect_and_run (bufs, start_frame, end_frame, speed, nframes, 0, lm.locked()); + connect_and_run (bufs, start_sample, end_sample, speed, nframes, 0, lm.locked()); } + _timing_stats.update (); } else { + _timing_stats.reset (); + // XXX should call ::silence() to run plugin(s) for consistent load. + // We'll need to change this anyway when bypass can be automated bypass (bufs, nframes); + automation_run (start_sample, nframes); // evaluate automation only _delaybuffers.flush (); } @@ -1153,10 +1244,10 @@ PluginInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame } void -PluginInsert::automation_run (BufferSet& bufs, framepos_t start, framepos_t end, double speed, pframes_t nframes) +PluginInsert::automate_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, pframes_t nframes) { Evoral::ControlEvent next_event (0, 0.0f); - framecnt_t offset = 0; + samplecnt_t offset = 0; Glib::Threads::Mutex::Lock lm (control_lock(), Glib::Threads::TRY_LOCK); @@ -1165,6 +1256,9 @@ PluginInsert::automation_run (BufferSet& bufs, framepos_t start, framepos_t end, return; } + /* map start back into loop-range, adjust end */ + map_loop_range (start, end); + if (!find_next_event (start, end, next_event) || _plugins.front()->requires_fixed_sized_buffers()) { /* no events have a time within the relevant range */ @@ -1175,7 +1269,7 @@ PluginInsert::automation_run (BufferSet& bufs, framepos_t start, framepos_t end, while (nframes) { - framecnt_t cnt = min (((framecnt_t) ceil (next_event.when) - start), (framecnt_t) nframes); + samplecnt_t cnt = min (((samplecnt_t) ceil (next_event.when) - start), (samplecnt_t) nframes); connect_and_run (bufs, start, start + cnt, speed, cnt, offset, true); // XXX (start + cnt) * speed @@ -1183,6 +1277,8 @@ PluginInsert::automation_run (BufferSet& bufs, framepos_t start, framepos_t end, offset += cnt; start += cnt; + map_loop_range (start, end); + if (!find_next_event (start, end, next_event)) { break; } @@ -1465,6 +1561,10 @@ bool PluginInsert::is_channelstrip () const { return _plugins.front()->is_channelstrip(); } +bool +PluginInsert::is_nonbypassable () const { + return _plugins.front()->is_nonbypassable (); +} #endif bool @@ -2308,19 +2408,13 @@ PluginInsert::automatic_can_support_io_configuration (ChanCount const & inx, Cha XMLNode& -PluginInsert::get_state () +PluginInsert::state () { - return state (true); -} - -XMLNode& -PluginInsert::state (bool full) -{ - XMLNode& node = Processor::state (full); + XMLNode& node = Processor::state (); - node.add_property("type", _plugins[0]->state_node_name()); - node.add_property("unique-id", _plugins[0]->unique_id()); - node.add_property("count", string_compose("%1", _plugins.size())); + node.set_property("type", _plugins[0]->state_node_name()); + node.set_property("unique-id", _plugins[0]->unique_id()); + node.set_property("count", (uint32_t)_plugins.size()); /* remember actual i/o configuration (for later placeholder * in case the plugin goes missing) */ @@ -2330,7 +2424,7 @@ PluginInsert::state (bool full) node.add_child_nocopy (* _preset_out.state (X_("PresetOutput"))); /* save custom i/o config */ - node.add_property("custom", _custom_cfg ? "yes" : "no"); + node.set_property("custom", _custom_cfg); for (uint32_t pc = 0; pc < get_count(); ++pc) { char tmp[128]; snprintf (tmp, sizeof(tmp), "InputMap-%d", pc); @@ -2341,7 +2435,7 @@ PluginInsert::state (bool full) node.add_child_nocopy (* _thru_map.state ("ThruMap")); if (_sidechain) { - node.add_child_nocopy (_sidechain->state (full)); + node.add_child_nocopy (_sidechain->get_state ()); } _plugins[0]->set_insert_id(this->id()); @@ -2366,19 +2460,19 @@ PluginInsert::set_control_ids (const XMLNode& node, int version) for (iter = nlist.begin(); iter != nlist.end(); ++iter) { if ((*iter)->name() == Controllable::xml_node_name) { - XMLProperty const * prop; uint32_t p = (uint32_t)-1; #ifdef LV2_SUPPORT - if ((prop = (*iter)->property (X_("symbol"))) != 0) { + std::string str; + if ((*iter)->get_property (X_("symbol"), str)) { boost::shared_ptr lv2plugin = boost::dynamic_pointer_cast (_plugins[0]); if (lv2plugin) { - p = lv2plugin->port_index(prop->value().c_str()); + p = lv2plugin->port_index(str.c_str()); } } #endif - if (p == (uint32_t)-1 && (prop = (*iter)->property (X_("parameter"))) != 0) { - p = atoi (prop->value()); + if (p == (uint32_t)-1) { + (*iter)->get_property (X_("parameter"), p); } if (p != (uint32_t)-1) { @@ -2407,36 +2501,34 @@ PluginInsert::set_state(const XMLNode& node, int version) XMLNodeList nlist = node.children(); XMLNodeIterator niter; XMLPropertyList plist; - XMLProperty const * prop; ARDOUR::PluginType type; - if ((prop = node.property ("type")) == 0) { + std::string str; + if (!node.get_property ("type", str)) { error << _("XML node describing plugin is missing the `type' field") << endmsg; return -1; } - if (prop->value() == X_("ladspa") || prop->value() == X_("Ladspa")) { /* handle old school sessions */ + if (str == X_("ladspa") || str == X_("Ladspa")) { /* handle old school sessions */ type = ARDOUR::LADSPA; - } else if (prop->value() == X_("lv2")) { + } else if (str == X_("lv2")) { type = ARDOUR::LV2; - } else if (prop->value() == X_("windows-vst")) { + } else if (str == X_("windows-vst")) { type = ARDOUR::Windows_VST; - } else if (prop->value() == X_("lxvst")) { + } else if (str == X_("lxvst")) { type = ARDOUR::LXVST; - } else if (prop->value() == X_("mac-vst")) { + } else if (str == X_("mac-vst")) { type = ARDOUR::MacVST; - } else if (prop->value() == X_("audiounit")) { + } else if (str == X_("audiounit")) { type = ARDOUR::AudioUnit; - } else if (prop->value() == X_("luaproc")) { + } else if (str == X_("luaproc")) { type = ARDOUR::Lua; } else { - error << string_compose (_("unknown plugin type %1 in plugin insert state"), - prop->value()) - << endmsg; + error << string_compose (_("unknown plugin type %1 in plugin insert state"), str) << endmsg; return -1; } - prop = node.property ("unique-id"); + XMLProperty const * prop = node.property ("unique-id"); if (prop == 0) { #ifdef WINDOWS_VST_SUPPORT @@ -2462,6 +2554,7 @@ PluginInsert::set_state(const XMLNode& node, int version) } boost::shared_ptr plugin = find_plugin (_session, prop->value(), type); + bool any_vst = false; /* treat VST plugins equivalent if they have the same uniqueID * allow to move sessions windows <> linux */ @@ -2469,6 +2562,7 @@ PluginInsert::set_state(const XMLNode& node, int version) if (plugin == 0 && (type == ARDOUR::Windows_VST || type == ARDOUR::MacVST)) { type = ARDOUR::LXVST; plugin = find_plugin (_session, prop->value(), type); + if (plugin) { any_vst = true; } } #endif @@ -2476,6 +2570,7 @@ PluginInsert::set_state(const XMLNode& node, int version) if (plugin == 0 && (type == ARDOUR::LXVST || type == ARDOUR::MacVST)) { type = ARDOUR::Windows_VST; plugin = find_plugin (_session, prop->value(), type); + if (plugin) { any_vst = true; } } #endif @@ -2483,6 +2578,7 @@ PluginInsert::set_state(const XMLNode& node, int version) if (plugin == 0 && (type == ARDOUR::Windows_VST || type == ARDOUR::LXVST)) { type = ARDOUR::MacVST; plugin = find_plugin (_session, prop->value(), type); + if (plugin) { any_vst = true; } } #endif @@ -2529,9 +2625,7 @@ PluginInsert::set_state(const XMLNode& node, int version) set_control_ids (node, version); } - if ((prop = node.property ("count")) != 0) { - sscanf (prop->value().c_str(), "%u", &count); - } + node.get_property ("count", count); if (_plugins.size() != count) { for (uint32_t n = 1; n < count; ++n) { @@ -2544,9 +2638,7 @@ PluginInsert::set_state(const XMLNode& node, int version) PBD::ID new_id = this->id(); PBD::ID old_id = this->id(); - if ((prop = node.property ("id")) != 0) { - old_id = prop->value (); - } + node.get_property ("id", old_id); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { @@ -2554,7 +2646,9 @@ PluginInsert::set_state(const XMLNode& node, int version) and set all plugins to the same state. */ - if ((*niter)->name() == plugin->state_node_name()) { + if ( ((*niter)->name() == plugin->state_node_name()) + || (any_vst && ((*niter)->name() == "lxvst" || (*niter)->name() == "windows-vst" || (*niter)->name() == "mac-vst")) + ) { for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) { /* Plugin state can include external files which are named after the ID. @@ -2609,9 +2703,7 @@ PluginInsert::set_state(const XMLNode& node, int version) set_parameter_state_2X (node, version); } - if ((prop = node.property (X_("custom"))) != 0) { - _custom_cfg = string_is_affirmative (prop->value()); - } + node.get_property (X_("custom"), _custom_cfg); uint32_t in_maps = 0; uint32_t out_maps = 0; @@ -2715,10 +2807,8 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version) } XMLNodeList cnodes; - XMLProperty const * cprop; XMLNodeConstIterator iter; XMLNode *child; - const char *port; uint32_t port_id; cnodes = (*niter)->children ("port"); @@ -2727,15 +2817,11 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version) child = *iter; - if ((cprop = child->property("number")) != 0) { - port = cprop->value().c_str(); - } else { + if (!child->get_property("number", port_id)) { warning << _("PluginInsert: Auto: no ladspa port number") << endmsg; continue; } - sscanf (port, "%" PRIu32, &port_id); - if (port_id >= _plugins[0]->parameter_count()) { warning << _("PluginInsert: Auto: port id out of range") << endmsg; continue; @@ -2747,30 +2833,6 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version) if (c && c->alist()) { if (!child->children().empty()) { c->alist()->set_state (*child->children().front(), version); - - /* In some cases 2.X saves lists with min_yval and max_yval - being FLT_MIN and FLT_MAX respectively. This causes problems - in A3 because these min/max values are used to compute - where GUI control points should be drawn. If we see such - values, `correct' them to the min/max of the appropriate - parameter. - */ - - float min_y = c->alist()->get_min_y (); - float max_y = c->alist()->get_max_y (); - - ParameterDescriptor desc; - _plugins.front()->get_parameter_descriptor (port_id, desc); - - if (min_y == FLT_MIN) { - min_y = desc.lower; - } - - if (max_y == FLT_MAX) { - max_y = desc.upper; - } - - c->alist()->set_yrange (min_y, max_y); } } else { error << string_compose (_("PluginInsert: automatable control %1 not found - ignored"), port_id) << endmsg; @@ -2783,6 +2845,16 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version) } } +boost::shared_ptr +PluginInsert::control_output (uint32_t num) const +{ + CtrlOutMap::const_iterator i = _control_outputs.find (num); + if (i == _control_outputs.end ()) { + return boost::shared_ptr (); + } else { + return (*i).second; + } +} string PluginInsert::describe_parameter (Evoral::Parameter param) @@ -2798,7 +2870,7 @@ PluginInsert::describe_parameter (Evoral::Parameter param) return Automatable::describe_parameter(param); } -ARDOUR::framecnt_t +ARDOUR::samplecnt_t PluginInsert::signal_latency() const { if (!_pending_active) { @@ -2825,7 +2897,6 @@ PluginInsert::PluginControl::PluginControl (PluginInsert* p, , _plugin (p) { if (alist()) { - alist()->reset_default (desc.normal); if (desc.toggled) { list->set_interpolation(Evoral::ControlList::Discrete); } @@ -2860,15 +2931,12 @@ PluginInsert::PluginControl::catch_up_with_external_value (double user_val) XMLNode& PluginInsert::PluginControl::get_state () { - stringstream ss; - XMLNode& node (AutomationControl::get_state()); - ss << parameter().id(); - node.add_property (X_("parameter"), ss.str()); + node.set_property (X_("parameter"), parameter().id()); #ifdef LV2_SUPPORT boost::shared_ptr lv2plugin = boost::dynamic_pointer_cast (_plugin->_plugins[0]); if (lv2plugin) { - node.add_property (X_("symbol"), lv2plugin->port_symbol (parameter().id())); + node.set_property (X_("symbol"), lv2plugin->port_symbol (parameter().id())); } #endif @@ -2895,10 +2963,6 @@ PluginInsert::PluginPropertyControl::PluginPropertyControl (PluginInsert* : AutomationControl (p->session(), param, desc, list) , _plugin (p) { - if (alist()) { - alist()->set_yrange (desc.lower, desc.upper); - alist()->reset_default (desc.normal); - } } void @@ -2925,11 +2989,8 @@ PluginInsert::PluginPropertyControl::actually_set_value (double user_val, Contro XMLNode& PluginInsert::PluginPropertyControl::get_state () { - stringstream ss; - XMLNode& node (AutomationControl::get_state()); - ss << parameter().id(); - node.add_property (X_("property"), ss.str()); + node.set_property (X_("property"), parameter().id()); node.remove_property (X_("value")); return node; @@ -2958,6 +3019,7 @@ PluginInsert::get_impulse_analysis_plugin() assert (out == internal_output_streams ()); } ret->configure_io (internal_input_streams (), out); + ret->set_owner (_owner); _impulseAnalysisPlugin = ret; } else { ret = _impulseAnalysisPlugin.lock(); @@ -2967,7 +3029,7 @@ PluginInsert::get_impulse_analysis_plugin() } void -PluginInsert::collect_signal_for_analysis (framecnt_t nframes) +PluginInsert::collect_signal_for_analysis (samplecnt_t nframes) { // called from outside the audio thread, so this should be safe // only do audio as analysis is (currently) only for audio plugins @@ -3065,8 +3127,8 @@ PluginInsert::start_touch (uint32_t param_id) { boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id)); if (ac) { - // ToDo subtract _plugin_signal_latency from audible_frame() when rolling, assert > 0 - ac->start_touch (session().audible_frame()); + // ToDo subtract _plugin_signal_latency from audible_sample() when rolling, assert > 0 + ac->start_touch (session().audible_sample()); } } @@ -3075,11 +3137,26 @@ PluginInsert::end_touch (uint32_t param_id) { boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id)); if (ac) { - // ToDo subtract _plugin_signal_latency from audible_frame() when rolling, assert > 0 - ac->stop_touch (true, session().audible_frame()); + // ToDo subtract _plugin_signal_latency from audible_sample() when rolling, assert > 0 + ac->stop_touch (session().audible_sample()); } } +bool +PluginInsert::get_stats (uint64_t& min, uint64_t& max, double& avg, double& dev) const +{ + /* TODO: consider taking a try/lock: Don't run concurrently with + * TimingStats::update, TimingStats::reset. + */ + return _timing_stats.get_stats (min, max, avg, dev); +} + +void +PluginInsert::clear_stats () +{ + g_atomic_int_set (&_stat_reset, 1); +} + std::ostream& operator<<(std::ostream& o, const ARDOUR::PluginInsert::Match& m) { switch (m.method) {