X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplugin_insert.cc;h=6e7cfe373ffc7fef61bfb1482d02281be8b49aee;hb=8d6d3c309d75f5280bf32cffcab271a287827c01;hp=6c2add6c4233f59e4eb502932fe7649cb24193f5;hpb=9a2fe5aad30b4f64d3d1705bcf33447632df06af;p=ardour.git

diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 6c2add6c42..6e7cfe373f 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -30,26 +30,28 @@
 #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"
-#include "ardour/port.h"
-#include "ardour/route.h"
 
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #endif
 
-#ifdef VST_SUPPORT
-#include "ardour/vst_plugin.h"
+#ifdef WINDOWS_VST_SUPPORT
+#include "ardour/windows_vst_plugin.h"
 #endif
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef LXVST_SUPPORT
+#include "ardour/lxvst_plugin.h"
+#endif
+
+#ifdef AUDIOUNIT_SUPPORT
 #include "ardour/audio_unit.h"
 #endif
 
-#include "ardour/audioengine.h"
 #include "ardour/session.h"
 #include "ardour/types.h"
 
@@ -65,16 +67,12 @@ 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)
-	, _splitting (false)
 {
 	/* the first is the master */
 
 	if (plug) {
 		add_plugin (plug);
 		create_automatable_parameters ();
-
-		Glib::Mutex::Lock em (_session.engine().process_lock());
-		IO::PortCountChanged (max(input_streams(), output_streams()));
 	}
 }
 
@@ -93,7 +91,11 @@ PluginInsert::set_count (uint32_t num)
 		uint32_t diff = num - _plugins.size();
 
 		for (uint32_t n = 0; n < diff; ++n) {
-			add_plugin_with_activation (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,11 +133,17 @@ PluginInsert::control_list_automation_state_changed (Evoral::Parameter which, Au
 ChanCount
 PluginInsert::output_streams() const
 {
-	ChanCount out = _plugins.front()->get_info()->n_outputs;
+	assert (!_plugins.empty());
 
-	if (out == ChanCount::INFINITE) {
-		return _plugins.front()->output_streams ();
+	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());
 		return out;
@@ -145,9 +153,22 @@ PluginInsert::output_streams() const
 ChanCount
 PluginInsert::input_streams() const
 {
-	ChanCount in = _plugins[0]->get_info()->n_inputs;
+	assert (!_plugins.empty());
+
+	ChanCount in;
 
-	if (_splitting) {
+	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.
@@ -159,11 +180,19 @@ PluginInsert::input_streams() const
 		}
 		return in;
 
-	} else if (in == ChanCount::INFINITE) {
-		return _plugins[0]->input_streams ();
+	} 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 {
-		in.set_audio (in.n_audio() * _plugins.size());
-		in.set_midi (in.n_midi() * _plugins.size());
+		
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			in.set (*t, in.get (*t) * _plugins.size ());
+		}
+
 		return in;
 	}
 }
@@ -233,21 +262,24 @@ PluginInsert::create_automatable_parameters ()
 }
 
 void
-PluginInsert::parameter_changed (Evoral::Parameter which, float val)
+PluginInsert::parameter_changed (uint32_t which, float val)
 {
-	if (which.type() != PluginAutomation)
-		return;
-
-	Plugins::iterator i = _plugins.begin();
-
-	/* don't set the first plugin, just all the slaves */
+	boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, which));
 
-	if (i != _plugins.end()) {
-		++i;
-		for (; i != _plugins.end(); ++i) {
-			(*i)->set_parameter (which, val);
-		}
-	}
+	if (ac) {
+		ac->set_double (val);
+                
+                Plugins::iterator i = _plugins.begin();
+                
+                /* don't set the first plugin, just all the slaves */
+                
+                if (i != _plugins.end()) {
+                        ++i;
+                        for (; i != _plugins.end(); ++i) {
+                                (*i)->set_parameter (which, val);
+                        }
+                }
+        }
 }
 
 int
@@ -300,18 +332,24 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of
 		collect_signal_nframes = nframes;
 	}
 
-	ChanMapping in_map(input_streams());
-	ChanMapping out_map(output_streams());
+	ChanCount const in_streams = input_streams ();
+	ChanCount const out_streams = output_streams ();
 
-	if (_splitting) {
+	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 */
-		Sample const * mono = bufs.get_audio (in_map.get (DataType::AUDIO, 0)).data (offset);
-		for (uint32_t i = input_streams().n_audio(); i < natural_input_streams().n_audio(); ++i) {
-			memcpy (bufs.get_audio (in_map.get (DataType::AUDIO, i)).data() + offset, mono + offset, sizeof (Sample) * (nframes - offset));
+		uint32_t first_idx = in_map.get (DataType::AUDIO, 0, &valid);
+		if (valid) {
+			Sample const * mono = bufs.get_audio (first_idx).data (offset);
+			for (uint32_t i = in_streams.n_audio(); i < natural_input_streams().n_audio(); ++i) {
+				memcpy (bufs.get_audio (in_map.get (DataType::AUDIO, i, &valid)).data (offset), mono, sizeof (Sample) * nframes);
+			}
 		}
 	}
 
@@ -404,7 +442,7 @@ PluginInsert::silence (framecnt_t nframes)
 	ChanMapping in_map(input_streams());
 	ChanMapping out_map(output_streams());
 
-	if (_splitting) {
+	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 ());
 	}
@@ -434,7 +472,7 @@ PluginInsert::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end
 			 * at the transitions of "active"
 			 */
 
-			uint32_t out = _plugins[0]->get_info()->n_outputs.n_audio();
+			uint32_t out = output_streams().n_audio ();
 
 			for (uint32_t n = 0; n < out; ++n) {
 				bufs.get_audio (n).silence (nframes);
@@ -446,15 +484,15 @@ PluginInsert::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end
 
 			/* does this need to be done with MIDI? it appears not */
 
-			uint32_t in = _plugins[0]->get_info()->n_inputs.n_audio();
-			uint32_t out = _plugins[0]->get_info()->n_outputs.n_audio();
+			uint32_t in = input_streams ().n_audio ();
+			uint32_t out = output_streams().n_audio ();
 
 			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(), bufs.get_audio(in - 1).data(), sizeof (Sample) * nframes);
+					memcpy (bufs.get_audio (n).data(), bufs.get_audio(in - 1).data(), sizeof (Sample) * nframes);
 				}
 			}
 
@@ -463,6 +501,12 @@ PluginInsert::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end
 	}
 
 	_active = _pending_active;
+
+	/* we have no idea whether the plugin generated silence or not, so mark
+	 * all buffers appropriately.
+	 */
+
+	bufs.set_is_silent (false);
 }
 
 void
@@ -567,10 +611,13 @@ PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
 #ifdef LV2_SUPPORT
 	boost::shared_ptr<LV2Plugin> lv2p;
 #endif
-#ifdef VST_SUPPORT
-	boost::shared_ptr<VSTPlugin> vp;
+#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
 
@@ -580,11 +627,15 @@ PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
 	} else if ((lv2p = boost::dynamic_pointer_cast<LV2Plugin> (other)) != 0) {
 		return boost::shared_ptr<Plugin> (new LV2Plugin (*lv2p));
 #endif
-#ifdef VST_SUPPORT
-	} else if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (other)) != 0) {
-		return boost::shared_ptr<Plugin> (new VSTPlugin (*vp));
+#ifdef WINDOWS_VST_SUPPORT
+	} else if ((vp = boost::dynamic_pointer_cast<WindowsVSTPlugin> (other)) != 0) {
+		return boost::shared_ptr<Plugin> (new WindowsVSTPlugin (*vp));
+#endif
+#ifdef LXVST_SUPPORT
+	} else if ((lxvp = boost::dynamic_pointer_cast<LXVSTPlugin> (other)) != 0) {
+		return boost::shared_ptr<Plugin> (new LXVSTPlugin (*lxvp));
 #endif
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 	} else if ((ap = boost::dynamic_pointer_cast<AUPlugin> (other)) != 0) {
 		return boost::shared_ptr<Plugin> (new AUPlugin (*ap));
 #endif
@@ -600,22 +651,33 @@ PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
 bool
 PluginInsert::configure_io (ChanCount in, ChanCount out)
 {
-	if (set_count (count_for_configuration (in, out)) == false) {
-		set_splitting (false);
+	Match old_match = _match;
+
+	/* 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) {
 		return false;
 	}
 
-	if (_plugins.front()->get_info()->n_inputs <= in) {
-		set_splitting (false);
+	/* a signal needs emitting if we start or stop splitting */
+	if (old_match.method != _match.method && (old_match.method == Split || _match.method == Split)) {
+		SplittingChanged (); /* EMIT SIGNAL */
+	}
+
+	/* configure plugins */
+	switch (_match.method) {
+	case Split:
+	case Hide:
+		if (_plugins.front()->configure_io (_plugins.front()->get_info()->n_inputs, out)) {
+			return false;
+		}
+		break;
+
+	default:
 		if (_plugins.front()->configure_io (in, out) == false) {
 			return false;
 		}
-	} else {
-		/* we must be splitting a single processor input to
-		   multiple plugin inputs
-		*/
-		set_splitting (true);
-		_plugins.front()->configure_io (_plugins.front()->get_info()->n_inputs, out);
+		break;
 	}
 
 	// we don't know the analysis window size, so we must work with the
@@ -633,16 +695,41 @@ PluginInsert::configure_io (ChanCount in, ChanCount out)
 	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_io_configuration (const ChanCount& in, ChanCount& out) const
 {
-	// Plugin has flexible I/O, so delegate to it
-	if (_plugins.front()->reconfigurable_io()) {
-		return _plugins.front()->can_support_io_configuration (in, out);
+	return private_can_support_io_configuration (in, out).method != Impossible;
+}
+
+/** 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 & in, ChanCount& out) const
+{
+	PluginInfoPtr info = _plugins.front()->get_info();
+
+	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);
+		}
+
+		return Match (Delegate, 1);
 	}
 
-	ChanCount inputs  = _plugins[0]->get_info()->n_inputs;
-	ChanCount outputs = _plugins[0]->get_info()->n_outputs;
+	ChanCount inputs  = info->n_inputs;
+	ChanCount outputs = info->n_outputs;
 
 	bool no_inputs = true;
 	for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
@@ -655,18 +742,21 @@ PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 	if (no_inputs) {
 		/* no inputs so we can take any input configuration since we throw it away */
 		out = outputs;
-		return true;
+		return Match (NoInputs, 1);
 	}
 
-	// Plugin inputs match requested inputs exactly
+	/* Plugin inputs match requested inputs exactly */
 	if (inputs == in) {
 		out = outputs;
-		return true;
+		return Match (ExactMatch, 1);
 	}
 
-	// See if replication is possible
-	// We allow replication only for plugins with either zero or 1 inputs and outputs
-	// for every valid data type.
+	/* 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) {
@@ -684,7 +774,6 @@ PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 		}
 
 		// Potential factor not set yet
-
 		if (f == 0) {
 			f = in.get(*t) / nin;
 		}
@@ -700,7 +789,7 @@ PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
 			out.set (*t, outputs.get(*t) * f);
 		}
-		return true;
+		return Match (Replicate, f);
 	}
 
 	/* If the processor has exactly one input of a given type, and
@@ -724,64 +813,38 @@ PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 
 	if (can_split) {
 		out = outputs;
-		return true;
+		return Match (Split, 1);
 	}
 
-	return false;
-}
-
-/* Number of plugin instances required to support a given channel configuration.
- * (private helper)
- */
-int32_t
-PluginInsert::count_for_configuration (ChanCount in, ChanCount /*out*/) const
-{
-	if (_plugins.front()->reconfigurable_io()) {
-		/* plugin has flexible I/O, so the answer is always 1 */
-		/* this could change if we ever decide to replicate AU's */
-		return 1;
-	}
-
-	// FIXME: take 'out' into consideration
-
-	ChanCount outputs = _plugins[0]->get_info()->n_outputs;
-	ChanCount inputs = _plugins[0]->get_info()->n_inputs;
-
-	if (inputs.n_total() == 0) {
-		/* instrument plugin, always legal, but throws away any existing streams */
-		return 1;
-	}
-
-	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 (inputs == in) {
-		/* exact match */
-		return 1;
-	}
+	/* If the plugin has more inputs than we want, we can `hide' some of them
+	   by feeding them silence.
+	*/
 
-	if (inputs > in) {
-		/* more plugin inputs than processor inputs, so we are splitting */
-		return 1;
+	bool could_hide = false;
+	bool cannot_hide = false;
+	ChanCount hide_channels;
+	
+	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;
+		}
 	}
 
-	// assumes in is valid, so we must be replicating
-	if (inputs.n_total() < in.n_total()
-			&& (in.n_total() % inputs.n_total() == 0)) {
-
-		return in.n_total() / inputs.n_total();
+	if (could_hide && !cannot_hide) {
+		out = outputs;
+		return Match (Hide, 1, hide_channels);
 	}
 
-	/* err... */
-	return 0;
+	return Match (Impossible, 0);
 }
 
 XMLNode&
-PluginInsert::get_state(void)
+PluginInsert::get_state ()
 {
 	return state (true);
 }
@@ -850,8 +913,10 @@ PluginInsert::set_state(const XMLNode& node, int version)
 		type = ARDOUR::LADSPA;
 	} else if (prop->value() == X_("lv2")) {
 		type = ARDOUR::LV2;
-	} else if (prop->value() == X_("vst")) {
-		type = ARDOUR::VST;
+	} 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 {
@@ -864,11 +929,19 @@ PluginInsert::set_state(const XMLNode& node, int version)
 	prop = node.property ("unique-id");
 
 	if (prop == 0) {
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 		/* older sessions contain VST plugins with only an "id" field.
 		 */
 
-		if (type == ARDOUR::VST) {
+		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
@@ -901,9 +974,7 @@ PluginInsert::set_state(const XMLNode& node, int version)
 	// state. We can't call Processor::set_state() until
 	// the plugins themselves are created and added.
 
-	if ((prop = node.property ("id")) != 0) {
-		_id = prop->value();
-	}
+	set_id (node);
 
 	if (_plugins.empty()) {
 		/* if we are adding the first plugin, we will need to set
@@ -969,13 +1040,6 @@ PluginInsert::set_state(const XMLNode& node, int version)
 		}
 	}
 
-	/* catch up on I/O */
-
-	{
-		Glib::Mutex::Lock em (_session.engine().process_lock());
-		IO::PortCountChanged (max(input_streams(), output_streams()));
-	}
-
 	return 0;
 }
 
@@ -1094,7 +1158,11 @@ PluginInsert::PluginControl::PluginControl (PluginInsert* p, const Evoral::Param
 	, _plugin (p)
 {
 	Plugin::ParameterDescriptor desc;
-	p->plugin(0)->get_parameter_descriptor (param.id(), desc);
+	boost::shared_ptr<Plugin> plugin = p->plugin (0);
+	
+	alist()->reset_default (plugin->default_value (param.id()));
+
+	plugin->get_parameter_descriptor (param.id(), desc);
 	_logarithmic = desc.logarithmic;
 	_sr_dependent = desc.sr_dependent;
 	_toggled = desc.toggled;
@@ -1106,29 +1174,20 @@ PluginInsert::PluginControl::set_value (double user_val)
 {
 	/* FIXME: probably should be taking out some lock here.. */
 
-	double const plugin_val = user_to_plugin (user_val);
-
 	for (Plugins::iterator i = _plugin->_plugins.begin(); i != _plugin->_plugins.end(); ++i) {
-		(*i)->set_parameter (_list->parameter().id(), plugin_val);
+		(*i)->set_parameter (_list->parameter().id(), user_val);
 	}
 
 	boost::shared_ptr<Plugin> iasp = _plugin->_impulseAnalysisPlugin.lock();
 	if (iasp) {
-		iasp->set_parameter (_list->parameter().id(), plugin_val);
+		iasp->set_parameter (_list->parameter().id(), user_val);
 	}
 
 	AutomationControl::set_value (user_val);
 }
 
 double
-PluginInsert::PluginControl::user_to_plugin (double val) const
-{
-	/* no known transformations at this time */
-	return val;
-}
-
-double
-PluginInsert::PluginControl::user_to_ui (double val) const
+PluginInsert::PluginControl::internal_to_interface (double val) const
 {
 	if (_logarithmic) {
 		if (val > 0) {
@@ -1142,7 +1201,7 @@ PluginInsert::PluginControl::user_to_ui (double val) const
 }
 
 double
-PluginInsert::PluginControl::ui_to_user (double val) const
+PluginInsert::PluginControl::interface_to_internal (double val) const
 {
 	if (_logarithmic) {
 		val = exp (val);
@@ -1151,20 +1210,6 @@ PluginInsert::PluginControl::ui_to_user (double val) const
 	return val;
 }
 
-/** Convert plugin values to UI values.  See pbd/controllable.h */
-double
-PluginInsert::PluginControl::plugin_to_ui (double val) const
-{
-	return user_to_ui (plugin_to_user (val));
-}
-
-double
-PluginInsert::PluginControl::plugin_to_user (double val) const
-{
-	/* no known transformations at this time */
-	return val;
-}
-
 XMLNode&
 PluginInsert::PluginControl::get_state ()
 {
@@ -1182,8 +1227,7 @@ double
 PluginInsert::PluginControl::get_value () const
 {
 	/* FIXME: probably should be taking out some lock here.. */
-
-	return plugin_to_user (_plugin->get_parameter (_list->parameter()));
+	return _plugin->get_parameter (_list->parameter());
 }
 
 boost::shared_ptr<Plugin>
@@ -1212,22 +1256,21 @@ PluginInsert::collect_signal_for_analysis (framecnt_t nframes)
 	_signal_analysis_collect_nframes_max = nframes;
 }
 
-/** Add a plugin to our list and activate it if we have already been activated */
-void
-PluginInsert::add_plugin_with_activation (boost::shared_ptr<Plugin> plugin)
-{
-	plugin->set_insert_info (this);
-	_plugins.push_back (plugin);
-	if (active()) {
-		plugin->activate ();
-	}
-}
-
 /** Add a plugin to our list */
 void
 PluginInsert::add_plugin (boost::shared_ptr<Plugin> plugin)
 {
 	plugin->set_insert_info (this);
+	
+	if (_plugins.empty()) {
+                /* first (and probably only) plugin instance - connect to relevant signals 
+                 */
+
+		plugin->ParameterChanged.connect_same_thread (*this, boost::bind (&PluginInsert::parameter_changed, 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);
 }
 
@@ -1240,12 +1283,35 @@ PluginInsert::realtime_handle_transport_stopped ()
 }
 
 void
-PluginInsert::set_splitting (bool s)
+PluginInsert::realtime_locate ()
 {
-	if (_splitting == s) {
-		return;
+	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());
+        }
+}
 
-	_splitting = s;
-	SplittingChanged (); /* EMIT SIGNAL */
+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());
+        }
 }