deactivate plugin if connect_and_run returns an error
[ardour.git] / libs / ardour / plugin_insert.cc
index 3faebd7179a8831863c39ae2365a3f7b10832c6e..96b8570d8c1c10f32a589d829f88c6660a23290c 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 */
 
-#include <string>
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
 
-#include <sigc++/bind.h>
+#include <string>
 
-#include <pbd/failed_constructor.h>
-#include <pbd/xml++.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
+#include "pbd/convert.h"
+
+#include "ardour/audio_buffer.h"
+#include "ardour/automation_list.h"
+#include "ardour/buffer_set.h"
+#include "ardour/debug.h"
+#include "ardour/event_type_map.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/plugin.h"
+#include "ardour/plugin_insert.h"
+
+#ifdef LV2_SUPPORT
+#include "ardour/lv2_plugin.h"
+#endif
 
-#include <ardour/plugin_insert.h>
-#include <ardour/plugin.h>
-#include <ardour/port.h>
-#include <ardour/route.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/buffer_set.h>
-#include <ardour/automation_event.h>
+#ifdef WINDOWS_VST_SUPPORT
+#include "ardour/windows_vst_plugin.h"
+#endif
 
-#ifdef VST_SUPPORT
-#include <ardour/vst_plugin.h>
+#ifdef LXVST_SUPPORT
+#include "ardour/lxvst_plugin.h"
 #endif
 
-#ifdef HAVE_AUDIOUNITS
-#include <ardour/audio_unit.h>
+#ifdef AUDIOUNIT_SUPPORT
+#include "ardour/audio_unit.h"
 #endif
 
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/types.h>
+#include "ardour/session.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
@@ -52,51 +63,17 @@ using namespace PBD;
 
 const string PluginInsert::port_automation_node_name = "PortAutomation";
 
-PluginInsert::PluginInsert (Session& s, boost::shared_ptr<Plugin> plug, Placement placement)
-       : Processor (s, plug->name(), placement)
+PluginInsert::PluginInsert (Session& s, boost::shared_ptr<Plugin> plug)
+       : Processor (s, (plug ? plug->name() : string ("toBeRenamed")))
+       , _signal_analysis_collected_nframes(0)
+       , _signal_analysis_collect_nframes_max(0)
 {
        /* the first is the master */
 
-       _plugins.push_back (plug);
-
-       init ();
-
-       {
-               Glib::Mutex::Lock em (_session.engine().process_lock());
-               IO::PortCountChanged (max(input_streams(), output_streams()));
-       }
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
-}
-
-PluginInsert::PluginInsert (Session& s, const XMLNode& node)
-       : Processor (s, "unnamed plugin insert", PreFader)
-{
-       if (set_state (node)) {
-               throw failed_constructor();
-       }
-
-       // set_automatable ();
-
-       {
-               Glib::Mutex::Lock em (_session.engine().process_lock());
-               IO::PortCountChanged (max(input_streams(), output_streams()));
-       }
-}
-
-PluginInsert::PluginInsert (const PluginInsert& other)
-       : Processor (other._session, other._name, other.placement())
-{
-       uint32_t count = other._plugins.size();
-
-       /* make as many copies as requested */
-       for (uint32_t n = 0; n < count; ++n) {
-               _plugins.push_back (plugin_factory (other.plugin (n)));
+       if (plug) {
+               add_plugin (plug);
+               create_automatable_parameters ();
        }
-
-       init ();
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 bool
@@ -105,16 +82,20 @@ PluginInsert::set_count (uint32_t num)
        bool require_state = !_plugins.empty();
 
        /* 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) { 
+       if (num == 0) {
                return false;
        } else if (num > _plugins.size()) {
                uint32_t diff = num - _plugins.size();
 
                for (uint32_t n = 0; n < diff; ++n) {
-                       _plugins.push_back (plugin_factory (_plugins[0]));
+                       boost::shared_ptr<Plugin> p = plugin_factory (_plugins[0]);
+                       add_plugin (p);
+                       if (active ()) {
+                               p->activate ();
+                       }
 
                        if (require_state) {
                                /* XXX do something */
@@ -131,26 +112,20 @@ PluginInsert::set_count (uint32_t num)
        return true;
 }
 
-void
-PluginInsert::init ()
-{
-       set_automatable ();
-}
-
 PluginInsert::~PluginInsert ()
 {
-       GoingAway (); /* EMIT SIGNAL */
 }
 
 void
-PluginInsert::auto_state_changed (Parameter which)
+PluginInsert::control_list_automation_state_changed (Evoral::Parameter which, AutoState s)
 {
        if (which.type() != PluginAutomation)
                return;
 
-       boost::shared_ptr<AutomationControl> c = control (which);
+       boost::shared_ptr<AutomationControl> c
+                       = boost::dynamic_pointer_cast<AutomationControl>(control (which));
 
-       if (c && c->list()->automation_state() != Off) {
+       if (c && s != Off) {
                _plugins[0]->set_parameter (which.id(), c->list()->eval (_session.transport_frame()));
        }
 }
@@ -158,19 +133,68 @@ PluginInsert::auto_state_changed (Parameter which)
 ChanCount
 PluginInsert::output_streams() const
 {
-       if (_configured)
-               return output_for_input_configuration(_configured_input);
-       else
-               return natural_output_streams();
+       assert (!_plugins.empty());
+
+       PluginInfoPtr info = _plugins.front()->get_info();
+
+       if (info->reconfigurable_io()) {
+               ChanCount out = _plugins.front()->output_streams ();
+               // DEBUG_TRACE (DEBUG::Processors, string_compose ("Plugin insert, reconfigur(able) output streams = %1\n", out));
+               return out;
+       } else {
+               ChanCount out = info->n_outputs;
+               // DEBUG_TRACE (DEBUG::Processors, string_compose ("Plugin insert, static output streams = %1 for %2 plugins\n", out, _plugins.size()));
+               out.set_audio (out.n_audio() * _plugins.size());
+               out.set_midi (out.n_midi() * _plugins.size() + midi_bypass.n_midi());
+               return out;
+       }
 }
 
 ChanCount
 PluginInsert::input_streams() const
 {
-       if (_configured)
-               return _configured_input;
-       else
-               return natural_input_streams();
+       assert (!_plugins.empty());
+
+       ChanCount in;
+
+       PluginInfoPtr info = _plugins.front()->get_info();
+
+       if (info->reconfigurable_io()) {
+               assert (_plugins.size() == 1);
+               in = _plugins.front()->input_streams();
+       } else {
+               in = info->n_inputs;
+       }
+
+       DEBUG_TRACE (DEBUG::Processors, string_compose ("Plugin insert, input streams = %1, match using %2\n", in, _match.method));
+
+       if (_match.method == Split) {
+
+               /* we are splitting 1 processor input to multiple plugin inputs,
+                  so we have a maximum of 1 stream of each type.
+               */
+               for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+                       if (in.get (*t) > 1) {
+                               in.set (*t, 1);
+                       }
+               }
+               return in;
+
+       } else if (_match.method == Hide) {
+
+               for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+                       in.set (*t, in.get (*t) - _match.hide.get (*t));
+               }
+               return in;
+
+       } else {
+
+               for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+                       in.set (*t, in.get (*t) * _plugins.size ());
+               }
+
+               return in;
+       }
 }
 
 ChanCount
@@ -186,46 +210,98 @@ PluginInsert::natural_input_streams() const
 }
 
 bool
-PluginInsert::is_generator() const
+PluginInsert::has_no_inputs() const
+{
+       return _plugins[0]->get_info()->n_inputs == ChanCount::ZERO;
+}
+
+bool
+PluginInsert::has_no_audio_inputs() const
+{
+       return _plugins[0]->get_info()->n_inputs.n_audio() == 0;
+}
+
+bool
+PluginInsert::is_midi_instrument() const
 {
        /* XXX more finesse is possible here. VST plugins have a
           a specific "instrument" flag, for example.
         */
+       PluginInfoPtr pi = _plugins[0]->get_info();
 
-       return _plugins[0]->get_info()->n_inputs.n_audio() == 0;
+       return pi->n_inputs.n_midi() != 0 &&
+               pi->n_outputs.n_audio() > 0;
 }
 
 void
-PluginInsert::set_automatable ()
+PluginInsert::create_automatable_parameters ()
 {
-       set<Parameter> a = _plugins.front()->automatable ();
+       assert (!_plugins.empty());
 
-       Plugin::ParameterDescriptor desc;
+       set<Evoral::Parameter> a = _plugins.front()->automatable ();
 
-       for (set<Parameter>::iterator i = a.begin(); i != a.end(); ++i) {
+       for (set<Evoral::Parameter>::iterator i = a.begin(); i != a.end(); ++i) {
                if (i->type() == PluginAutomation) {
-                       can_automate (*i);
+
+                       Evoral::Parameter param(*i);
+
+                       ParameterDescriptor desc;
                        _plugins.front()->get_parameter_descriptor(i->id(), desc);
-                       boost::shared_ptr<AutomationList> list(new AutomationList(
-                                       *i,
-                                       //(desc.min_unbound ? FLT_MIN : desc.lower),
-                                       //(desc.max_unbound ? FLT_MAX : desc.upper),
-                                       desc.lower, desc.upper,
-                                       _plugins.front()->default_value(i->id())));
 
-                       add_control(boost::shared_ptr<AutomationControl>(
-                                       new PluginControl(*this, list)));
+                       can_automate (param);
+                       boost::shared_ptr<AutomationList> list(new AutomationList(param, desc));
+                       add_control (boost::shared_ptr<AutomationControl> (new PluginControl(this, param, desc, list)));
+               } 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<AutomationList> list;
+                               if (Variant::type_is_numeric(desc.datatype)) {
+                                       list = boost::shared_ptr<AutomationList>(new AutomationList(param, desc));
+                               }
+                               add_control (boost::shared_ptr<AutomationControl> (new PluginPropertyControl(this, param, desc, list)));
+                       }
                }
        }
 }
-
+/** Called when something outside of this host has modified a plugin
+ * parameter. Responsible for propagating the change to two places:
+ *
+ *   1) anything listening to the Control itself
+ *   2) any replicated plugins that make up this PluginInsert.
+ *
+ * The PluginInsert is connected to the ParameterChangedExternally signal for
+ * the first (primary) plugin, and here broadcasts that change to any others.
+ *
+ * XXX We should probably drop this whole replication idea (Paul, October 2015)
+ * since it isn't used by sensible plugin APIs (AU, LV2).
+ */
 void
-PluginInsert::parameter_changed (Parameter which, float val)
+PluginInsert::parameter_changed_externally (uint32_t which, float val)
 {
-       if (which.type() != PluginAutomation)
+       boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, which));
+
+       /* First propagation: alter the underlying value of the control,
+        * without telling the plugin(s) that own/use it to set it.
+        */
+
+       if (!ac) {
                return;
+       }
+
+       boost::shared_ptr<PluginControl> pc = boost::dynamic_pointer_cast<PluginControl> (ac);
+
+       if (pc) {
+               pc->catch_up_with_external_value (val);
+       }
 
-       vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin();
+       /* Second propagation: tell all plugins except the first to
+          update the value of this parameter. For sane plugin APIs,
+          there are no other plugins, so this is a no-op in those
+          cases.
+       */
+
+       Plugins::iterator i = _plugins.begin();
 
        /* don't set the first plugin, just all the slaves */
 
@@ -237,35 +313,78 @@ PluginInsert::parameter_changed (Parameter which, float val)
        }
 }
 
-void
-PluginInsert::set_block_size (nframes_t nframes)
+int
+PluginInsert::set_block_size (pframes_t nframes)
 {
-       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
-               (*i)->set_block_size (nframes);
+       int ret = 0;
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+               if ((*i)->set_block_size (nframes) != 0) {
+                       ret = -1;
+               }
        }
+       return ret;
 }
 
 void
 PluginInsert::activate ()
 {
-       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
                (*i)->activate ();
        }
+
+       Processor::activate ();
 }
 
 void
 PluginInsert::deactivate ()
 {
-       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+       Processor::deactivate ();
+
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
                (*i)->deactivate ();
        }
 }
 
 void
-PluginInsert::connect_and_run (BufferSet& bufs, nframes_t nframes, nframes_t offset, bool with_auto, nframes_t now)
+PluginInsert::flush ()
+{
+       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+               (*i)->flush ();
+       }
+}
+
+void
+PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t offset, bool with_auto, framepos_t now)
 {
-       uint32_t in_index = 0;
-       uint32_t out_index = 0;
+       // Calculate if, and how many frames we need to collect for analysis
+       framecnt_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
+               collect_signal_nframes = nframes;
+       }
+
+       ChanCount const in_streams = input_streams ();
+       ChanCount const out_streams = output_streams ();
+
+       ChanMapping in_map (in_streams);
+       ChanMapping out_map (out_streams);
+       bool valid;
+       if (_match.method == Split) {
+               /* fix the input mapping so that we have maps for each of the plugin's inputs */
+               in_map = ChanMapping (natural_input_streams ());
+
+               /* copy the first stream's buffer contents to the others */
+               /* XXX: audio only */
+               uint32_t first_idx = in_map.get (DataType::AUDIO, 0, &valid);
+               if (valid) {
+                       for (uint32_t i = in_streams.n_audio(); i < natural_input_streams().n_audio(); ++i) {
+                               bufs.get_audio(in_map.get (DataType::AUDIO, i, &valid)).read_from(bufs.get_audio(first_idx), nframes, offset, offset);
+                       }
+               }
+       }
+
+       bufs.set_count(ChanCount::max(bufs.count(), in_streams));
+       bufs.set_count(ChanCount::max(bufs.count(), out_streams));
 
        /* Note that we've already required that plugins
           be able to handle in-place processing.
@@ -274,148 +393,204 @@ PluginInsert::connect_and_run (BufferSet& bufs, nframes_t nframes, nframes_t off
        if (with_auto) {
 
                uint32_t n = 0;
-               
-               for (Controls::iterator li = _controls.begin(); li != _controls.end(); ++li, ++n) {
-                       
-                       boost::shared_ptr<AutomationControl> c = li->second;
 
-                       if (c->parameter().type() == PluginAutomation && c->list()->automation_playback()) {
+               for (Controls::iterator li = controls().begin(); li != controls().end(); ++li, ++n) {
+
+                       boost::shared_ptr<AutomationControl> c
+                               = boost::dynamic_pointer_cast<AutomationControl>(li->second);
+
+                       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 (now, valid);
 
                                if (valid) {
-                                       c->set_value(val);
+                                       /* This is the ONLY place where we are
+                                        *  allowed to call
+                                        *  AutomationControl::set_value_unchecked(). We
+                                        *  know that the control is in
+                                        *  automation playback mode, so no
+                                        *  check on writable() is required
+                                        *  (which must be done in AutomationControl::set_value()
+                                        *
+                                        */
+                                       c->set_value_unchecked(val);
                                }
 
-                       } 
+                       }
                }
        }
 
-       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
-               (*i)->connect_and_run (bufs, in_index, out_index, nframes, offset);
+       if (collect_signal_nframes > 0) {
+               // collect input
+               //std::cerr << "collect input, bufs " << bufs.count().n_audio() << " count,  " << bufs.available().n_audio() << " available" << std::endl;
+               //std::cerr << "               streams " << 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(input_streams());
+
+               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
+               }
+
+       }
+
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+               if ((*i)->connect_and_run(bufs, in_map, out_map, nframes, offset)) {
+                       deactivate ();
+               }
+               for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+                       in_map.offset_to(*t, natural_input_streams().get(*t));
+                       out_map.offset_to(*t, natural_output_streams().get(*t));
+               }
        }
 
+       if (collect_signal_nframes > 0) {
+               // collect output
+               //std::cerr << "       output, bufs " << bufs.count().n_audio() << " count,  " << bufs.available().n_audio() << " available" << std::endl;
+               //std::cerr << "               streams " << output_streams().n_audio() << std::endl;
+
+               _signal_analysis_outputs.set_count(output_streams());
+
+               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,
+                               _signal_analysis_collected_nframes); // offset is for target buffer
+               }
+
+               _signal_analysis_collected_nframes += collect_signal_nframes;
+               assert(_signal_analysis_collected_nframes <= _signal_analysis_collect_nframes_max);
+
+               if (_signal_analysis_collected_nframes == _signal_analysis_collect_nframes_max) {
+                       _signal_analysis_collect_nframes_max = 0;
+                       _signal_analysis_collected_nframes   = 0;
+
+                       AnalysisDataGathered(&_signal_analysis_inputs,
+                                            &_signal_analysis_outputs);
+               }
+       }
        /* leave remaining channel buffers alone */
 }
 
 void
-PluginInsert::silence (nframes_t nframes, nframes_t offset)
+PluginInsert::silence (framecnt_t nframes)
 {
-       uint32_t in_index = 0;
-       uint32_t out_index = 0;
+       if (!active ()) {
+               return;
+       }
 
-       if (active()) {
-               for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
-                       (*i)->connect_and_run (_session.get_silent_buffers ((*i)->get_info()->n_inputs), in_index, out_index, nframes, offset);
-               }
+       ChanMapping in_map(input_streams());
+       ChanMapping out_map(output_streams());
+
+       if (_match.method == Split) {
+               /* fix the input mapping so that we have maps for each of the plugin's inputs */
+               in_map = ChanMapping (natural_input_streams ());
+       }
+
+       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);
        }
 }
-       
+
 void
-PluginInsert::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
+PluginInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t /*end_frame*/, pframes_t nframes, bool)
 {
-       if (active()) {
+       if (_pending_active) {
+               /* run as normal if we are active or moving from inactive to active */
 
-               if (_session.transport_rolling()) {
-                       automation_run (bufs, nframes, offset);
+               if (_session.transport_rolling() || _session.bounce_processing()) {
+                       automation_run (bufs, start_frame, nframes);
                } else {
-                       connect_and_run (bufs, nframes, offset, false);
+                       connect_and_run (bufs, nframes, 0, false);
                }
+
        } else {
+               uint32_t in = input_streams ().n_audio ();
+               uint32_t out = output_streams().n_audio ();
+
+               if (has_no_audio_inputs() || in == 0) {
 
-               /* FIXME: type, audio only */
+                       /* silence all (audio) outputs. Should really declick
+                        * at the transitions of "active"
+                        */
 
-               uint32_t in = _plugins[0]->get_info()->n_inputs.n_audio();
-               uint32_t out = _plugins[0]->get_info()->n_outputs.n_audio();
+                       for (uint32_t n = 0; n < out; ++n) {
+                               bufs.get_audio (n).silence (nframes);
+                       }
 
-               if (out > in) {
+               } else if (out > in) {
 
                        /* not active, but something has make up for any channel count increase */
-                       
-                       for (uint32_t n = out - in; n < out; ++n) {
-                               memcpy (bufs.get_audio(n).data(nframes, offset), bufs.get_audio(in - 1).data(nframes, offset), sizeof (Sample) * nframes);
+
+                       // TODO: option round-robin (n % in) or silence additional buffers ??
+                       // 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);
+               bufs.count().set_audio (out);
        }
-}
-
-void
-PluginInsert::set_parameter (Parameter param, float val)
-{
-       if (param.type() != PluginAutomation)
-               return;
 
-       /* the others will be set from the event triggered by this */
+       _active = _pending_active;
 
-       _plugins[0]->set_parameter (param.id(), val);
-       
-       boost::shared_ptr<AutomationControl> c = control (param);
-       
-       if (c)
-               c->set_value(val);
-
-       _session.set_dirty();
-}
+       /* we have no idea whether the plugin generated silence or not, so mark
+        * all buffers appropriately.
+        */
 
-float
-PluginInsert::get_parameter (Parameter param)
-{
-       if (param.type() != PluginAutomation)
-               return 0.0;
-       else
-               return
-               _plugins[0]->get_parameter (param.id());
 }
 
 void
-PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes, nframes_t offset)
+PluginInsert::automation_run (BufferSet& bufs, framepos_t start, pframes_t nframes)
 {
-       ControlEvent next_event (0, 0.0f);
-       nframes_t now = _session.transport_frame ();
-       nframes_t end = now + nframes;
+       Evoral::ControlEvent next_event (0, 0.0f);
+       framepos_t now = start;
+       framepos_t end = now + nframes;
+       framecnt_t offset = 0;
 
-       Glib::Mutex::Lock lm (_automation_lock, Glib::TRY_LOCK);
+       Glib::Threads::Mutex::Lock lm (control_lock(), Glib::Threads::TRY_LOCK);
 
        if (!lm.locked()) {
                connect_and_run (bufs, nframes, offset, false);
                return;
        }
-       
-       if (!find_next_event (now, end, next_event)) {
-               
-               /* no events have a time within the relevant range */
-               
-               connect_and_run (bufs, nframes, offset, true, now);
-               return;
-       }
-       
-       while (nframes) {
-
-               nframes_t cnt = min (((nframes_t) ceil (next_event.when) - now), nframes);
-  
-               connect_and_run (bufs, cnt, offset, true, now);
-               
-               nframes -= cnt;
-               offset += cnt;
+
+       if (!find_next_event (now, end, next_event) || requires_fixed_sized_buffers()) {
+
+               /* no events have a time within the relevant range */
+
+               connect_and_run (bufs, nframes, offset, true, now);
+               return;
+       }
+
+       while (nframes) {
+
+               framecnt_t cnt = min (((framecnt_t) ceil (next_event.when) - now), (framecnt_t) nframes);
+
+               connect_and_run (bufs, cnt, offset, true, now);
+
+               nframes -= cnt;
+               offset += cnt;
                now += cnt;
 
                if (!find_next_event (now, end, next_event)) {
                        break;
                }
-       }
-  
-       /* cleanup anything that is left to do */
-  
-       if (nframes) {
-               connect_and_run (bufs, nframes, offset, true, now);
-       }
-}      
+       }
+
+       /* cleanup anything that is left to do */
+
+       if (nframes) {
+               connect_and_run (bufs, nframes, offset, true, now);
+       }
+}
 
 float
-PluginInsert::default_parameter_value (Parameter param)
+PluginInsert::default_parameter_value (const Evoral::Parameter& param)
 {
        if (param.type() != PluginAutomation)
                return 1.0;
@@ -423,30 +598,107 @@ PluginInsert::default_parameter_value (Parameter param)
        if (_plugins.empty()) {
                fatal << _("programming error: ") << X_("PluginInsert::default_parameter_value() called with no plugin")
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        return _plugins[0]->default_value (param.id());
 }
 
+
+bool
+PluginInsert::can_reset_all_parameters ()
+{
+       bool all = true;
+       uint32_t params = 0;
+       for (uint32_t par = 0; par < _plugins[0]->parameter_count(); ++par) {
+               bool ok=false;
+               const uint32_t cid = _plugins[0]->nth_parameter (par, ok);
+
+               if (!ok || !_plugins[0]->parameter_is_input(cid)) {
+                       continue;
+               }
+
+               boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter(PluginAutomation, 0, cid));
+               if (!ac) {
+                       continue;
+               }
+
+               ++params;
+               if (ac->automation_state() & Play) {
+                       all = false;
+                       break;
+               }
+       }
+       return all && (params > 0);
+}
+
+bool
+PluginInsert::reset_parameters_to_default ()
+{
+       bool all = true;
+
+       for (uint32_t par = 0; par < _plugins[0]->parameter_count(); ++par) {
+               bool ok=false;
+               const uint32_t cid = _plugins[0]->nth_parameter (par, ok);
+
+               if (!ok || !_plugins[0]->parameter_is_input(cid)) {
+                       continue;
+               }
+
+               const float dflt = _plugins[0]->default_value (cid);
+               const float curr = _plugins[0]->get_parameter (cid);
+
+               if (dflt == curr) {
+                       continue;
+               }
+
+               boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter(PluginAutomation, 0, cid));
+               if (!ac) {
+                       continue;
+               }
+
+               if (ac->automation_state() & Play) {
+                       all = false;
+                       continue;
+               }
+
+               ac->set_value (dflt, Controllable::NoGroup);
+       }
+       return all;
+}
+
 boost::shared_ptr<Plugin>
 PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
 {
        boost::shared_ptr<LadspaPlugin> lp;
-#ifdef VST_SUPPORT
-       boost::shared_ptr<VSTPlugin> vp;
+#ifdef LV2_SUPPORT
+       boost::shared_ptr<LV2Plugin> lv2p;
+#endif
+#ifdef WINDOWS_VST_SUPPORT
+       boost::shared_ptr<WindowsVSTPlugin> vp;
 #endif
-#ifdef HAVE_AUDIOUNITS
+#ifdef LXVST_SUPPORT
+       boost::shared_ptr<LXVSTPlugin> lxvp;
+#endif
+#ifdef AUDIOUNIT_SUPPORT
        boost::shared_ptr<AUPlugin> ap;
 #endif
 
        if ((lp = boost::dynamic_pointer_cast<LadspaPlugin> (other)) != 0) {
                return boost::shared_ptr<Plugin> (new LadspaPlugin (*lp));
-#ifdef VST_SUPPORT
-       } else if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (other)) != 0) {
-               return boost::shared_ptr<Plugin> (new VSTPlugin (*vp));
+#ifdef LV2_SUPPORT
+       } else if ((lv2p = boost::dynamic_pointer_cast<LV2Plugin> (other)) != 0) {
+               return boost::shared_ptr<Plugin> (new LV2Plugin (*lv2p));
+#endif
+#ifdef WINDOWS_VST_SUPPORT
+       } else if ((vp = boost::dynamic_pointer_cast<WindowsVSTPlugin> (other)) != 0) {
+               return boost::shared_ptr<Plugin> (new WindowsVSTPlugin (*vp));
 #endif
-#ifdef HAVE_AUDIOUNITS
+#ifdef LXVST_SUPPORT
+       } else if ((lxvp = boost::dynamic_pointer_cast<LXVSTPlugin> (other)) != 0) {
+               return boost::shared_ptr<Plugin> (new LXVSTPlugin (*lxvp));
+#endif
+#ifdef AUDIOUNIT_SUPPORT
        } else if ((ap = boost::dynamic_pointer_cast<AUPlugin> (other)) != 0) {
                return boost::shared_ptr<Plugin> (new AUPlugin (*ap));
 #endif
@@ -455,150 +707,235 @@ PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
        fatal << string_compose (_("programming error: %1"),
                          X_("unknown plugin type in PluginInsert::plugin_factory"))
              << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return boost::shared_ptr<Plugin> ((Plugin*) 0);
 }
 
 bool
 PluginInsert::configure_io (ChanCount in, ChanCount out)
 {
-       ChanCount matching_out = output_for_input_configuration(out);
-       if (matching_out != out) {
-               _configured = false;
+       Match old_match = _match;
+       ChanCount old_in = input_streams ();
+       ChanCount old_out = output_streams ();
+
+       _configured_in = in;
+       _configured_out = out;
+
+       /* set the matching method and number of plugins that we will use to meet this configuration */
+       _match = private_can_support_io_configuration (in, out);
+       if (set_count (_match.plugins) == false) {
+               PluginIoReConfigure (); /* EMIT SIGNAL */
                return false;
-       } else {
-               bool success = set_count (count_for_configuration(in, out));
-               if (success)
-                       Processor::configure_io(in, out);
-               return success;
        }
+
+       /* configure plugins */
+       switch (_match.method) {
+       case Split:
+       case Hide:
+               if (_plugins.front()->configure_io (_plugins.front()->get_info()->n_inputs, out) == false) {
+                       PluginIoReConfigure (); /* EMIT SIGNAL */
+                       return false;
+               }
+               break;
+
+       default:
+               if (_plugins.front()->configure_io (in, out) == false) {
+                       PluginIoReConfigure (); /* EMIT SIGNAL */
+                       return false;
+               }
+               break;
+       }
+
+       if (  (old_match.method != _match.method && (old_match.method == Split || _match.method == Split))
+                       || old_in != in
+                       || old_out != out
+                       )
+       {
+               PluginIoReConfigure (); /* EMIT SIGNAL */
+       }
+
+       // we don't know the analysis window size, so we must work with the
+       // current buffer size here. each request for data fills in these
+       // 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);
+
+       session().ensure_buffer_set (_signal_analysis_outputs, out);
+       //_signal_analysis_outputs.set_count (out);
+
+       // std::cerr << "set counts to i" << in.n_audio() << "/o" << out.n_audio() << std::endl;
+
+       return Processor::configure_io (in, out);
 }
 
+/** Decide whether this PluginInsert can support a given IO configuration.
+ *  To do this, we run through a set of possible solutions in rough order of
+ *  preference.
+ *
+ *  @param in Required input channel count.
+ *  @param out Filled in with the output channel count if we return true.
+ *  @return true if the given IO configuration can be supported.
+ */
 bool
-PluginInsert::can_support_input_configuration (ChanCount in) const
+PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
-       ChanCount outputs = _plugins[0]->get_info()->n_outputs;
-       ChanCount inputs = _plugins[0]->get_info()->n_inputs;
+       return private_can_support_io_configuration (in, out).method != Impossible;
+}
 
-       /* see output_for_input_configuration below */
-       if ((inputs.n_total() == 0)
-                       || (inputs.n_total() == 1 && outputs == inputs)
-                       || (inputs.n_total() == 1 && outputs == inputs
-                               && ((inputs.n_audio() == 0 && in.n_audio() == 0)
-                                       || (inputs.n_midi() == 0 && in.n_midi() == 0)))
-                       || (inputs == in)) {
-               return true;
+/** A private version of can_support_io_configuration which returns the method
+ *  by which the configuration can be matched, rather than just whether or not
+ *  it can be.
+ */
+PluginInsert::Match
+PluginInsert::private_can_support_io_configuration (ChanCount const & inx, ChanCount& out)
+{
+       if (_plugins.empty()) {
+               return Match();
        }
 
-       bool can_replicate = true;
+       PluginInfoPtr info = _plugins.front()->get_info();
+       ChanCount in; in += inx;
+       midi_bypass.reset();
 
-       /* if number of inputs is a factor of the requested input
-          configuration for every type, we can replicate.
-       */
-       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-               if (inputs.get(*t) >= in.get(*t) || (inputs.get(*t) % in.get(*t) != 0)) {
-                       can_replicate = false;
-                       break;
+       if (info->reconfigurable_io()) {
+               /* Plugin has flexible I/O, so delegate to it */
+               bool const r = _plugins.front()->can_support_io_configuration (in, out);
+               if (!r) {
+                       return Match (Impossible, 0);
                }
-       }
 
-       if (can_replicate && (in.n_total() % inputs.n_total() == 0)) {
-               return true;
-       } else {
-               return false;
+               return Match (Delegate, 1);
        }
-}
 
-ChanCount
-PluginInsert::output_for_input_configuration (ChanCount in) const
-{
-       ChanCount outputs = _plugins[0]->get_info()->n_outputs;
-       ChanCount inputs = _plugins[0]->get_info()->n_inputs;
+       ChanCount inputs  = info->n_inputs;
+       ChanCount outputs = info->n_outputs;
 
-       if (inputs.n_total() == 0) {
-               /* instrument plugin, always legal, but throws away any existing streams */
-               return outputs;
+       if (in.get(DataType::MIDI) == 1 && outputs.get(DataType::MIDI) == 0) {
+               DEBUG_TRACE ( DEBUG::Processors, string_compose ("bypassing midi-data around %1\n", name()));
+               midi_bypass.set(DataType::MIDI, 1);
+       }
+       if (in.get(DataType::MIDI) == 1 && inputs.get(DataType::MIDI) == 0) {
+               DEBUG_TRACE ( DEBUG::Processors, string_compose ("hiding midi-port from plugin %1\n", name()));
+               in.set(DataType::MIDI, 0);
        }
 
-       if (inputs.n_total() == 1 && outputs == inputs
-                       && ((inputs.n_audio() == 0 && in.n_audio() == 0)
-                               || (inputs.n_midi() == 0 && in.n_midi() == 0))) {
-               /* mono plugin, replicate as needed to match in */
-               return in;
+       bool no_inputs = true;
+       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+               if (inputs.get (*t) != 0) {
+                       no_inputs = false;
+                       break;
+               }
        }
 
-       if (inputs == in) {
-               /* exact match */
-               return outputs;
+       if (no_inputs) {
+               /* no inputs so we can take any input configuration since we throw it away */
+               out = outputs + midi_bypass;
+               return Match (NoInputs, 1);
        }
 
-       bool can_replicate = true;
+       /* Plugin inputs match requested inputs exactly */
+       if (inputs == in) {
+               out = outputs + midi_bypass;
+               return Match (ExactMatch, 1);
+       }
 
-       /* if number of inputs is a factor of the requested input
-          configuration for every type, we can replicate.
+       /* We may be able to run more than one copy of the plugin within this insert
+          to cope with the insert having more inputs than the plugin.
+          We allow replication only for plugins with either zero or 1 inputs and outputs
+          for every valid data type.
        */
+
+       uint32_t f             = 0;
+       bool     can_replicate = true;
        for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-               if (inputs.get(*t) >= in.get(*t) || (in.get(*t) % inputs.get(*t) != 0)) {
+
+               uint32_t nin = inputs.get (*t);
+
+               // No inputs of this type
+               if (nin == 0 && in.get(*t) == 0) {
+                       continue;
+               }
+
+               if (nin != 1 || outputs.get (*t) != 1) {
+                       can_replicate = false;
+                       break;
+               }
+
+               // Potential factor not set yet
+               if (f == 0) {
+                       f = in.get(*t) / nin;
+               }
+
+               // Factor for this type does not match another type, can not replicate
+               if (f != (in.get(*t) / nin)) {
                        can_replicate = false;
                        break;
                }
        }
 
-       if (can_replicate && (inputs.n_total() % in.n_total() == 0)) {
-               ChanCount output;
-               
+       if (can_replicate) {
                for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-                       output.set(*t, outputs.get(*t) * (in.get(*t) / inputs.get(*t)));
+                       out.set (*t, outputs.get(*t) * f);
                }
-
-               return output;
+               out += midi_bypass;
+               return Match (Replicate, f);
        }
 
-       /* sorry */
-       return ChanCount();
-}
+       /* If the processor has exactly one input of a given type, and
+          the plugin has more, we can feed the single processor input
+          to some or all of the plugin inputs.  This is rather
+          special-case-y, but the 1-to-many case is by far the
+          simplest.  How do I split thy 2 processor inputs to 3
+          plugin inputs?  Let me count the ways ...
+       */
 
-/* Number of plugin instances required to support a given channel configuration.
- * (private helper)
- */
-int32_t
-PluginInsert::count_for_configuration (ChanCount in, ChanCount out) const
-{
-       // FIXME: take 'out' into consideration
-       
-       ChanCount outputs = _plugins[0]->get_info()->n_outputs;
-       ChanCount inputs = _plugins[0]->get_info()->n_inputs;
+       bool can_split = true;
+       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
 
-       if (inputs.n_total() == 0) {
-               /* instrument plugin, always legal, but throws away any existing streams */
-               return 1;
-       }
+               bool const can_split_type = (in.get (*t) == 1 && inputs.get (*t) > 1);
+               bool const nothing_to_do_for_type = (in.get (*t) == 0 && inputs.get (*t) == 0);
 
-       if (inputs.n_total() == 1 && outputs == inputs
-                       && ((inputs.n_audio() == 0 && in.n_audio() == 0)
-                               || (inputs.n_midi() == 0 && in.n_midi() == 0))) {
-               /* mono plugin, replicate as needed to match in */
-               return in.n_total();
+               if (!can_split_type && !nothing_to_do_for_type) {
+                       can_split = false;
+               }
        }
 
-       if (inputs == in) {
-               /* exact match */
-               return 1;
+       if (can_split) {
+               out = outputs + midi_bypass;
+               return Match (Split, 1);
        }
 
-       // assumes in is valid, so we must be replicating
-       if (inputs.n_total() < in.n_total()
-                       && (in.n_total() % inputs.n_total() == 0)) {
+       /* If the plugin has more inputs than we want, we can `hide' some of them
+          by feeding them silence.
+       */
+
+       bool could_hide = false;
+       bool cannot_hide = false;
+       ChanCount hide_channels;
 
-               return in.n_total() / inputs.n_total();
+       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+               if (inputs.get(*t) > in.get(*t)) {
+                       /* there is potential to hide, since the plugin has more inputs of type t than the insert */
+                       hide_channels.set (*t, inputs.get(*t) - in.get(*t));
+                       could_hide = true;
+               } else if (inputs.get(*t) < in.get(*t)) {
+                       /* we definitely cannot hide, since the plugin has fewer inputs of type t than the insert */
+                       cannot_hide = true;
+               }
        }
 
-       /* err... */
-       return 0;
+       if (could_hide && !cannot_hide) {
+               out = outputs + midi_bypass;
+               return Match (Hide, 1, hide_channels);
+       }
+
+       midi_bypass.reset();
+       return Match (Impossible, 0);
 }
 
 XMLNode&
-PluginInsert::get_state(void)
+PluginInsert::get_state ()
 {
        return state (true);
 }
@@ -606,60 +943,98 @@ PluginInsert::get_state(void)
 XMLNode&
 PluginInsert::state (bool full)
 {
-       char buf[256];
        XMLNode& node = Processor::state (full);
 
-       node.add_property ("type", _plugins[0]->state_node_name());
-       snprintf(buf, sizeof(buf), "%s", _plugins[0]->name());
-       node.add_property("id", string(buf));
-       if (_plugins[0]->state_node_name() == "ladspa") {
-               char buf[32];
-               snprintf (buf, sizeof (buf), "%ld", _plugins[0]->get_info()->unique_id); 
-               node.add_property("unique-id", string(buf));
-       }
+       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()));
+
+       /* 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 (* _configured_out.state (X_("ConfiguredOutput")));
+
+       _plugins[0]->set_insert_id(this->id());
        node.add_child_nocopy (_plugins[0]->get_state());
 
-       /* add port automation state */
-       XMLNode *autonode = new XMLNode(port_automation_node_name);
-       set<Parameter> automatable = _plugins[0]->automatable();
-       
-       for (set<Parameter>::iterator x = automatable.begin(); x != automatable.end(); ++x) {
-               
-               /*XMLNode* child = new XMLNode("port");
-               snprintf(buf, sizeof(buf), "%" PRIu32, *x);
-               child->add_property("number", string(buf));
-               
-               child->add_child_nocopy (automation_list (*x).state (full));
-               autonode->add_child_nocopy (*child);
-               */
-               autonode->add_child_nocopy (control(*x)->list()->state (full));
+       for (Controls::iterator c = controls().begin(); c != controls().end(); ++c) {
+               boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> ((*c).second);
+               if (ac) {
+                       node.add_child_nocopy (ac->get_state());
+               }
        }
 
-       node.add_child_nocopy (*autonode);
-       
        return node;
 }
 
+void
+PluginInsert::set_control_ids (const XMLNode& node, int version)
+{
+       const XMLNodeList& nlist = node.children();
+       XMLNodeConstIterator iter;
+       set<Evoral::Parameter>::const_iterator p;
+
+       for (iter = nlist.begin(); iter != nlist.end(); ++iter) {
+               if ((*iter)->name() == Controllable::xml_node_name) {
+                       const XMLProperty* prop;
+
+                       uint32_t p = (uint32_t)-1;
+#ifdef LV2_SUPPORT
+                       if ((prop = (*iter)->property (X_("symbol"))) != 0) {
+                               boost::shared_ptr<LV2Plugin> lv2plugin = boost::dynamic_pointer_cast<LV2Plugin> (_plugins[0]);
+                               if (lv2plugin) {
+                                       p = lv2plugin->port_index(prop->value().c_str());
+                               }
+                       }
+#endif
+                       if (p == (uint32_t)-1 && (prop = (*iter)->property (X_("parameter"))) != 0) {
+                               p = atoi (prop->value());
+                       }
+
+                       if (p != (uint32_t)-1) {
+
+                               /* this may create the new controllable */
+
+                               boost::shared_ptr<Evoral::Control> c = control (Evoral::Parameter (PluginAutomation, 0, p));
+
+#ifndef NO_PLUGIN_STATE
+                               if (!c) {
+                                       continue;
+                               }
+                               boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> (c);
+                               if (ac) {
+                                       ac->set_state (**iter, version);
+                               }
+#endif
+                       }
+               }
+       }
+}
+
 int
-PluginInsert::set_state(const XMLNode& node)
+PluginInsert::set_state(const XMLNode& node, int version)
 {
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
        XMLPropertyList plist;
        const XMLProperty *prop;
-       long unique = 0;
        ARDOUR::PluginType type;
 
        if ((prop = node.property ("type")) == 0) {
-               error << _("XML node describing insert is missing the `type' field") << endmsg;
+               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 */
                type = ARDOUR::LADSPA;
-       } else if (prop->value() == X_("vst")) {
-               type = ARDOUR::VST;
+       } else if (prop->value() == X_("lv2")) {
+               type = ARDOUR::LV2;
+       } else if (prop->value() == X_("windows-vst")) {
+               type = ARDOUR::Windows_VST;
+       } else if (prop->value() == X_("lxvst")) {
+               type = ARDOUR::LXVST;
+       } else if (prop->value() == X_("audiounit")) {
+               type = ARDOUR::AudioUnit;
        } else {
                error << string_compose (_("unknown plugin type %1 in plugin insert state"),
                                  prop->value())
@@ -668,68 +1043,187 @@ PluginInsert::set_state(const XMLNode& node)
        }
 
        prop = node.property ("unique-id");
-       if (prop != 0) {
-               unique = atol(prop->value().c_str());
+
+       if (prop == 0) {
+#ifdef WINDOWS_VST_SUPPORT
+               /* older sessions contain VST plugins with only an "id" field.
+                */
+
+               if (type == ARDOUR::Windows_VST) {
+                       prop = node.property ("id");
+               }
+#endif
+
+#ifdef LXVST_SUPPORT
+               /*There shouldn't be any older sessions with linuxVST support.. but anyway..*/
+
+               if (type == ARDOUR::LXVST) {
+                       prop = node.property ("id");
+               }
+#endif
+               /* recheck  */
+
+               if (prop == 0) {
+                       error << _("Plugin has no unique ID field") << endmsg;
+                       return -1;
+               }
        }
 
-       if ((prop = node.property ("id")) == 0) {
-               error << _("XML node describing insert is missing the `id' field") << endmsg;
-               return -1;
+       boost::shared_ptr<Plugin> plugin = find_plugin (_session, prop->value(), type);
+
+       /* treat linux and windows VST plugins equivalent if they have the same uniqueID
+        * allow to move sessions windows <> linux */
+#ifdef LXVST_SUPPORT
+       if (plugin == 0 && type == ARDOUR::Windows_VST) {
+               type = ARDOUR::LXVST;
+               plugin = find_plugin (_session, prop->value(), type);
        }
+#endif
 
-       boost::shared_ptr<Plugin> plugin;
-       
-       if (unique != 0) {
-               plugin = find_plugin (_session, "", unique, type);      
-       } else {
-               plugin = find_plugin (_session, prop->value(), 0, type);        
+#ifdef WINDOWS_VST_SUPPORT
+       if (plugin == 0 && type == ARDOUR::LXVST) {
+               type = ARDOUR::Windows_VST;
+               plugin = find_plugin (_session, prop->value(), type);
        }
+#endif
 
        if (plugin == 0) {
-               error << string_compose(_("Found a reference to a plugin (\"%1\") that is unknown.\n"
-                                  "Perhaps it was removed or moved since it was last used."), prop->value()) 
+               error << string_compose(
+                       _("Found a reference to a plugin (\"%1\") that is unknown.\n"
+                         "Perhaps it was removed or moved since it was last used."),
+                       prop->value())
                      << endmsg;
                return -1;
        }
 
+       // The name of the PluginInsert comes from the plugin, nothing else
+       _name = plugin->get_info()->name;
+
        uint32_t count = 1;
 
+       // Processor::set_state() will set this, but too late
+       // for it to be available when setting up plugin
+       // state. We can't call Processor::set_state() until
+       // the plugins themselves are created and added.
+
+       set_id (node);
+
+       if (_plugins.empty()) {
+               /* if we are adding the first plugin, we will need to set
+                  up automatable controls.
+               */
+               add_plugin (plugin);
+               create_automatable_parameters ();
+               set_control_ids (node, version);
+       }
+
        if ((prop = node.property ("count")) != 0) {
                sscanf (prop->value().c_str(), "%u", &count);
        }
 
        if (_plugins.size() != count) {
-               
-               _plugins.push_back (plugin);
-               
-               for (uint32_t n=1; n < count; ++n) {
-                       _plugins.push_back (plugin_factory (plugin));
+               for (uint32_t n = 1; n < count; ++n) {
+                       add_plugin (plugin_factory (plugin));
                }
        }
-       
+
+       Processor::set_state (node, version);
+
+       PBD::ID new_id = this->id();
+       PBD::ID old_id = this->id();
+
+       if ((prop = node.property ("id")) != 0) {
+               old_id = prop->value ();
+       }
+
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+
+               /* find the node with the type-specific node name ("lv2", "ladspa", etc)
+                  and set all plugins to the same state.
+               */
+
                if ((*niter)->name() == plugin->state_node_name()) {
-                       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
-                               (*i)->set_state (**niter);
+
+                       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+                               /* Plugin state can include external files which are named after the ID.
+                                *
+                                * If regenerate_xml_or_string_ids() is set, the ID will already have
+                                * been changed, so we need to use the old ID from the XML to load the
+                                * state and then update the ID.
+                                *
+                                * When copying a plugin-state, route_ui takes care of of updating the ID,
+                                * but we need to call set_insert_id() to clear the cached plugin-state
+                                * and force a change.
+                                */
+                               if (!regenerate_xml_or_string_ids ()) {
+                                       (*i)->set_insert_id (new_id);
+                               } else {
+                                       (*i)->set_insert_id (old_id);
+                               }
+
+                               (*i)->set_state (**niter, version);
+
+                               if (regenerate_xml_or_string_ids ()) {
+                                       (*i)->set_insert_id (new_id);
+                               }
                        }
+
                        break;
                }
-       } 
+       }
 
-       const XMLNode* insert_node = &node;
+       if (version < 3000) {
 
-       // legacy sessions: search for child IOProcessor node
-       for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               if ((*niter)->name() == "IOProcessor") {
-                       insert_node = *niter;
-                       break;
+               /* Only 2.X sessions need a call to set_parameter_state() - in 3.X and above
+                  this is all handled by Automatable
+               */
+
+               for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+                       if ((*niter)->name() == "Redirect") {
+                               /* XXX do we need to tackle placement? i think not (pd; oct 16 2009) */
+                               Processor::set_state (**niter, version);
+                               break;
+                       }
                }
+
+               set_parameter_state_2X (node, version);
+       }
+
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+               if (active()) {
+                       (*i)->activate ();
+               } else {
+                       (*i)->deactivate ();
+               }
+       }
+
+       return 0;
+}
+
+void
+PluginInsert::update_id (PBD::ID id)
+{
+       set_id (id.to_s());
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+               (*i)->set_insert_id (id);
        }
-       
-       Processor::set_state (*insert_node);
+}
+
+void
+PluginInsert::set_state_dir (const std::string& d)
+{
+       // state() only saves the state of the first plugin
+       _plugins[0]->set_state_dir (d);
+}
+
+void
+PluginInsert::set_parameter_state_2X (const XMLNode& node, int version)
+{
+       XMLNodeList nlist = node.children();
+       XMLNodeIterator niter;
 
        /* look for port automation node */
-       
+
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
                if ((*niter)->name() != port_automation_node_name) {
@@ -742,73 +1236,85 @@ PluginInsert::set_state(const XMLNode& node)
                XMLNode *child;
                const char *port;
                uint32_t port_id;
-               
+
                cnodes = (*niter)->children ("port");
-               
-               for(iter = cnodes.begin(); iter != cnodes.end(); ++iter){
-                       
+
+               for (iter = cnodes.begin(); iter != cnodes.end(); ++iter){
+
                        child = *iter;
-                       
+
                        if ((cprop = child->property("number")) != 0) {
                                port = cprop->value().c_str();
                        } else {
                                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;
                        }
 
-                       if (!child->children().empty()) {
-                               control (Parameter(PluginAutomation, port_id), true)->list()->set_state (*child->children().front());
-                       } else {
-                               if ((cprop = child->property("auto")) != 0) {
-                                       
-                                       /* old school */
+                       boost::shared_ptr<AutomationControl> c = boost::dynamic_pointer_cast<AutomationControl>(
+                                       control(Evoral::Parameter(PluginAutomation, 0, port_id), true));
 
-                                       int x;
-                                       sscanf (cprop->value().c_str(), "0x%x", &x);
-                                       control (Parameter(PluginAutomation, port_id), true)->list()->set_automation_state (AutoState (x));
+                       if (c && c->alist()) {
+                               if (!child->children().empty()) {
+                                       c->alist()->set_state (*child->children().front(), version);
 
-                               } else {
-                                       
-                                       /* missing */
-                                       
-                                       control (Parameter(PluginAutomation, port_id), true)->list()->set_automation_state (Off);
+                                       /* 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;
                        }
-
                }
 
                /* done */
 
                break;
-       } 
-
-       if (niter == nlist.end()) {
-               warning << string_compose(_("XML node describing a port automation is missing the `%1' information"), port_automation_node_name) << endmsg;
        }
-       
-       // The name of the PluginInsert comes from the plugin, nothing else
-       _name = plugin->get_info()->name;
-       
-       return 0;
 }
 
+
 string
-PluginInsert::describe_parameter (Parameter param)
+PluginInsert::describe_parameter (Evoral::Parameter param)
 {
-       if (param.type() != PluginAutomation)
-               return Automatable::describe_parameter(param);
-
-       return _plugins[0]->describe_parameter (param);
+       if (param.type() == PluginAutomation) {
+               return _plugins[0]->describe_parameter (param);
+       } else if (param.type() == PluginPropertyAutomation) {
+               boost::shared_ptr<AutomationControl> c(automation_control(param));
+               if (c && !c->desc().label.empty()) {
+                       return c->desc().label;
+               }
+       }
+       return Automatable::describe_parameter(param);
 }
 
-ARDOUR::nframes_t 
+ARDOUR::framecnt_t
 PluginInsert::signal_latency() const
 {
        if (_user_latency) {
@@ -821,100 +1327,244 @@ PluginInsert::signal_latency() const
 ARDOUR::PluginType
 PluginInsert::type ()
 {
-       boost::shared_ptr<LadspaPlugin> lp;
-#ifdef VST_SUPPORT
-       boost::shared_ptr<VSTPlugin> vp;
-#endif
-#ifdef HAVE_AUDIOUNITS
-       boost::shared_ptr<AUPlugin> ap;
-#endif
-       
-       PluginPtr other = plugin ();
+       return plugin()->get_info()->type;
+}
 
-       if ((lp = boost::dynamic_pointer_cast<LadspaPlugin> (other)) != 0) {
-               return ARDOUR::LADSPA;
-#ifdef VST_SUPPORT
-       } else if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (other)) != 0) {
-               return ARDOUR::VST;
-#endif
-#ifdef HAVE_AUDIOUNITS
-       } else if ((ap = boost::dynamic_pointer_cast<AUPlugin> (other)) != 0) {
-               return ARDOUR::AudioUnit;
-#endif
-       } else {
-               /* NOT REACHED */
-               return (ARDOUR::PluginType) 0;
+PluginInsert::PluginControl::PluginControl (PluginInsert*                     p,
+                                            const Evoral::Parameter&          param,
+                                            const ParameterDescriptor&        desc,
+                                            boost::shared_ptr<AutomationList> list)
+       : AutomationControl (p->session(), param, desc, list, p->describe_parameter(param))
+       , _plugin (p)
+{
+       if (alist()) {
+               alist()->reset_default (desc.normal);
+               if (desc.toggled) {
+                       list->set_interpolation(Evoral::ControlList::Discrete);
+               }
+       }
+
+       if (desc.toggled) {
+               set_flags(Controllable::Toggle);
        }
 }
 
-PluginInsert::PluginControl::PluginControl (PluginInsert& p, boost::shared_ptr<AutomationList> list)
-       : AutomationControl (p.session(), list, p.describe_parameter(list->parameter()))
-       , _plugin (p)
-       , _list (list)
+/** @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)
 {
-       Plugin::ParameterDescriptor desc;
-       p.plugin(0)->get_parameter_descriptor (list->parameter().id(), desc);
-       _logarithmic = desc.logarithmic;
-       _toggled = desc.toggled;
+       /* used only by automation playback */
+       _set_value (user_val, Controllable::NoGroup);
 }
-        
+
 void
-PluginInsert::PluginControl::set_value (float val)
+PluginInsert::PluginControl::_set_value (double user_val, PBD::Controllable::GroupControlDisposition group_override)
 {
        /* FIXME: probably should be taking out some lock here.. */
-       
-       if (_toggled) {
-               if (val > 0.5) {
-                       val = 1.0;
-               } else {
-                       val = 0.0;
-               }
-       } else {
-                       
-               /*const float range = _list->get_max_y() - _list->get_min_y();
-               const float lower = _list->get_min_y();
 
-               if (!_logarithmic) {
-                       val = lower + (range * val);
-               } else {
-                       float log_lower = 0.0f;
-                       if (lower > 0.0f) {
-                               log_lower = log(lower);
-                       }
+       for (Plugins::iterator i = _plugin->_plugins.begin(); i != _plugin->_plugins.end(); ++i) {
+               (*i)->set_parameter (_list->parameter().id(), user_val);
+       }
+
+       boost::shared_ptr<Plugin> iasp = _plugin->_impulseAnalysisPlugin.lock();
+       if (iasp) {
+               iasp->set_parameter (_list->parameter().id(), user_val);
+       }
 
-                       val = exp(log_lower + log(range) * val);
-               }*/
+       AutomationControl::set_value (user_val, group_override);
+}
+
+void
+PluginInsert::PluginControl::catch_up_with_external_value (double user_val)
+{
+       AutomationControl::set_value (user_val, Controllable::NoGroup);
+}
 
+XMLNode&
+PluginInsert::PluginControl::get_state ()
+{
+       stringstream ss;
+
+       XMLNode& node (AutomationControl::get_state());
+       ss << parameter().id();
+       node.add_property (X_("parameter"), ss.str());
+#ifdef LV2_SUPPORT
+       boost::shared_ptr<LV2Plugin> lv2plugin = boost::dynamic_pointer_cast<LV2Plugin> (_plugin->_plugins[0]);
+       if (lv2plugin) {
+               node.add_property (X_("symbol"), lv2plugin->port_symbol (parameter().id()));
        }
+#endif
 
-       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugin._plugins.begin();
-                       i != _plugin._plugins.end(); ++i) {
-               (*i)->set_parameter (_list->parameter().id(), val);
+       return node;
+}
+
+/** @return `user' val */
+double
+PluginInsert::PluginControl::get_value () const
+{
+       boost::shared_ptr<Plugin> plugin = _plugin->plugin (0);
+
+       if (!plugin) {
+               return 0.0;
        }
 
-       AutomationControl::set_value(val);
+       return plugin->get_parameter (_list->parameter().id());
 }
 
-float
-PluginInsert::PluginControl::get_value (void) const
+PluginInsert::PluginPropertyControl::PluginPropertyControl (PluginInsert*                     p,
+                                                            const Evoral::Parameter&          param,
+                                                            const ParameterDescriptor&        desc,
+                                                            boost::shared_ptr<AutomationList> list)
+       : AutomationControl (p->session(), param, desc, list)
+       , _plugin (p)
 {
-       /* FIXME: probably should be taking out some lock here.. */
-       
-       float val = _plugin.get_parameter (_list->parameter());
+       if (alist()) {
+               alist()->set_yrange (desc.lower, desc.upper);
+               alist()->reset_default (desc.normal);
+       }
 
-       return val;
+       if (desc.toggled) {
+               set_flags(Controllable::Toggle);
+       }
+}
 
-       /*if (_toggled) {
-               
-               return val;
-               
+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)
+{
+       /* Old numeric set_value(), coerce to appropriate datatype if possible.
+          This is lossy, but better than nothing until Ardour's automation system
+          can handle various datatypes all the way down. */
+       const Variant value(_desc.datatype, user_val);
+       if (value.type() == Variant::NOTHING) {
+               error << "set_value(double) called for non-numeric property" << endmsg;
+               return;
+       }
+
+       for (Plugins::iterator i = _plugin->_plugins.begin(); i != _plugin->_plugins.end(); ++i) {
+               (*i)->set_property(_list->parameter().id(), value);
+       }
+
+       _value = value;
+       AutomationControl::set_value (user_val, Controllable::NoGroup);
+}
+
+XMLNode&
+PluginInsert::PluginPropertyControl::get_state ()
+{
+       stringstream ss;
+
+       XMLNode& node (AutomationControl::get_state());
+       ss << parameter().id();
+       node.add_property (X_("property"), ss.str());
+       node.remove_property (X_("value"));
+
+       return node;
+}
+
+double
+PluginInsert::PluginPropertyControl::get_value () const
+{
+       return _value.to_double();
+}
+
+boost::shared_ptr<Plugin>
+PluginInsert::get_impulse_analysis_plugin()
+{
+       boost::shared_ptr<Plugin> ret;
+       if (_impulseAnalysisPlugin.expired()) {
+               ret = plugin_factory(_plugins[0]);
+               ret->configure_io (input_streams (), output_streams ());
+               _impulseAnalysisPlugin = ret;
        } else {
-               
-               if (_logarithmic) {
-                       val = log(val);
-               }
-               
-               return ((val - lower) / range);
-       }*/
+               ret = _impulseAnalysisPlugin.lock();
+       }
+
+       return ret;
+}
+
+void
+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, 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;
 }
 
+/** Add a plugin to our list */
+void
+PluginInsert::add_plugin (boost::shared_ptr<Plugin> plugin)
+{
+       plugin->set_insert_id (this->id());
+
+       if (_plugins.empty()) {
+                /* first (and probably only) plugin instance - connect to relevant signals
+                 */
+
+               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));
+       }
+
+       _plugins.push_back (plugin);
+}
+
+void
+PluginInsert::realtime_handle_transport_stopped ()
+{
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+               (*i)->realtime_handle_transport_stopped ();
+       }
+}
+
+void
+PluginInsert::realtime_locate ()
+{
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+               (*i)->realtime_locate ();
+       }
+}
+
+void
+PluginInsert::monitoring_changed ()
+{
+       for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
+               (*i)->monitoring_changed ();
+       }
+}
+
+void
+PluginInsert::start_touch (uint32_t param_id)
+{
+        boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id));
+        if (ac) {
+                ac->start_touch (session().audible_frame());
+        }
+}
+
+void
+PluginInsert::end_touch (uint32_t param_id)
+{
+        boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id));
+        if (ac) {
+                ac->stop_touch (true, session().audible_frame());
+        }
+}