X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomatable.cc;h=3e5eec54f7d2899bd6c3b4ced050679c2da5e33c;hb=f28ccd5e3a1350e09a1bf9ee0734db9b2e5db315;hp=c71fabda3794564049a7f28b4e31c87a2a34f81f;hpb=ece5093234e4c185cf536d2b4e5edfeb90622409;p=ardour.git

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index c71fabda37..3e5eec54f7 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -17,54 +17,81 @@
 
 */
 
-#include "ardour/ardour.h"
-#include <fstream>
-#include <inttypes.h>
 #include <cstdio>
 #include <errno.h>
-#include "pbd/error.h"
-#include "pbd/enumwriter.h"
 
-#include "midi++/names.h"
+#include "pbd/gstdio_compat.h"
+#include <glibmm/miscutils.h>
+
+#include "pbd/error.h"
 
-#include "ardour/automatable.h"
 #include "ardour/amp.h"
+#include "ardour/automatable.h"
 #include "ardour/event_type_map.h"
+#include "ardour/gain_control.h"
+#include "ardour/monitor_control.h"
 #include "ardour/midi_track.h"
-#include "ardour/panner.h"
+#include "ardour/pan_controllable.h"
+#include "ardour/pannable.h"
+#include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
+#include "ardour/record_enable_control.h"
 #include "ardour/session.h"
+#ifdef LV2_SUPPORT
+#include "ardour/uri_map.h"
+#endif
+#include "ardour/value_as_string.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-nframes_t Automatable::_automation_interval = 0;
+/* used for templates (previously: !full_state) */
+bool Automatable::skip_saving_automation = false;
+
+const string Automatable::xml_node_name = X_("Automation");
 
 Automatable::Automatable(Session& session)
 	: _a_session(session)
-	, _last_automation_snapshot(0)
+	, _automated_controls (new ControlList)
 {
 }
 
 Automatable::Automatable (const Automatable& other)
-        : ControlSet (other)
-        , _a_session (other._a_session)
-        , _last_automation_snapshot (0)
+	: ControlSet (other)
+	, Slavable ()
+	, _a_session (other._a_session)
+	, _automated_controls (new ControlList)
 {
-        Glib::Mutex::Lock lm (other._control_lock);
+	Glib::Threads::Mutex::Lock lm (other._control_lock);
 
-        for (Controls::const_iterator i = other._controls.begin(); i != other._controls.end(); ++i) {
-                boost::shared_ptr<Evoral::Control> ac (control_factory (i->first));
+	for (Controls::const_iterator i = other._controls.begin(); i != other._controls.end(); ++i) {
+		boost::shared_ptr<Evoral::Control> ac (control_factory (i->first));
 		add_control (ac);
-        }
+	}
 }
+
+Automatable::~Automatable ()
+{
+	{
+		RCUWriter<ControlList> writer (_automated_controls);
+		boost::shared_ptr<ControlList> cl = writer.get_copy ();
+		cl->clear ();
+	}
+	_automated_controls.flush ();
+
+	Glib::Threads::Mutex::Lock lm (_control_lock);
+	for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
+		boost::dynamic_pointer_cast<AutomationControl>(li->second)->drop_references ();
+	}
+}
+
 int
 Automatable::old_set_automation_state (const XMLNode& node)
 {
-	const XMLProperty *prop;
+	XMLProperty const * prop;
 
 	if ((prop = node.property ("path")) != 0) {
 		load_automation (prop->value());
@@ -72,24 +99,6 @@ Automatable::old_set_automation_state (const XMLNode& node)
 		warning << _("Automation node has no path property") << endmsg;
 	}
 
-	if ((prop = node.property ("visible")) != 0) {
-		uint32_t what;
-		stringstream sstr;
-
-		_visible_controls.clear ();
-
-		sstr << prop->value();
-		while (1) {
-			sstr >> what;
-			if (sstr.fail()) {
-				break;
-			}
-			mark_automation_visible (Evoral::Parameter(PluginAutomation, 0, what), true);
-		}
-	}
-
-	_last_automation_snapshot = 0;
-
 	return 0;
 }
 
@@ -98,13 +107,14 @@ Automatable::load_automation (const string& path)
 {
 	string fullpath;
 
-	if (path[0] == '/') { // legacy
+	if (Glib::path_is_absolute (path)) { // legacy
 		fullpath = path;
 	} else {
 		fullpath = _a_session.automation_dir();
 		fullpath += path;
 	}
-	ifstream in (fullpath.c_str());
+
+	FILE * in = g_fopen (fullpath.c_str (), "rb");
 
 	if (!in) {
 		warning << string_compose(_("cannot open %2 to load automation data (%3)")
@@ -112,20 +122,21 @@ Automatable::load_automation (const string& path)
 		return 1;
 	}
 
-	Glib::Mutex::Lock lm (control_lock());
+	Glib::Threads::Mutex::Lock lm (control_lock());
 	set<Evoral::Parameter> tosave;
 	controls().clear ();
 
-	_last_automation_snapshot = 0;
-
-	while (in) {
+	while (!feof(in)) {
 		double when;
 		double value;
 		uint32_t port;
 
-		in >> port;  if (!in) break;
-		in >> when;  if (!in) goto bad;
-		in >> value; if (!in) goto bad;
+		if (3 != fscanf (in, "%d %lf %lf", &port, &when, &value)) {
+			if (feof(in)) {
+				break;
+			}
+			goto bad;
+		}
 
 		Evoral::Parameter param(PluginAutomation, 0, port);
 		/* FIXME: this is legacy and only used for plugin inserts?  I think? */
@@ -133,12 +144,14 @@ Automatable::load_automation (const string& path)
 		c->list()->add (when, value);
 		tosave.insert (param);
 	}
+	::fclose (in);
 
 	return 0;
 
-  bad:
+bad:
 	error << string_compose(_("cannot load automation data from %2"), fullpath) << endmsg;
 	controls().clear ();
+	::fclose (in);
 	return -1;
 }
 
@@ -147,29 +160,22 @@ Automatable::add_control(boost::shared_ptr<Evoral::Control> ac)
 {
 	Evoral::Parameter param = ac->parameter();
 
-	ControlSet::add_control(ac);
-	_can_automate_list.insert(param);
-	auto_state_changed(param); // sync everything up
+	boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (ac->list ());
 
-	/* connect to automation_state_changed so that we can emit a signal when one of our controls'
-	   automation state changes
-	*/
-	boost::shared_ptr<AutomationControl> c = boost::dynamic_pointer_cast<AutomationControl> (ac);
-	if (c) {
-		c->alist()->automation_state_changed.connect_same_thread (
-			_control_connections, boost::bind (&Automatable::automation_state_changed, this, c->parameter())
-			);
+	boost::shared_ptr<AutomationControl> actl (boost::dynamic_pointer_cast<AutomationControl> (ac));
+
+	if ((!actl || !(actl->flags() & Controllable::NotAutomatable)) && al) {
+		al->automation_state_changed.connect_same_thread (
+			_list_connections,
+			boost::bind (&Automatable::automation_list_automation_state_changed,
+			             this, ac->parameter(), _1));
 	}
-}
 
-void
-Automatable::what_has_visible_data(set<Evoral::Parameter>& s) const
-{
-	Glib::Mutex::Lock lm (control_lock());
-	set<Evoral::Parameter>::const_iterator li;
+	ControlSet::add_control (ac);
 
-	for (li = _visible_controls.begin(); li != _visible_controls.end(); ++li) {
-		s.insert  (*li);
+	if ((!actl || !(actl->flags() & Controllable::NotAutomatable)) && al) {
+		_can_automate_list.insert (param);
+		automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up
 	}
 }
 
@@ -180,18 +186,24 @@ Automatable::describe_parameter (Evoral::Parameter param)
 
 	if (param == Evoral::Parameter(GainAutomation)) {
 		return _("Fader");
-	} else if (param.type() == PanAutomation) {
-		/* ID's are zero-based, present them as 1-based */
-		return (string_compose(_("Pan %1"), param.id() + 1));
+	} else if (param.type() == TrimAutomation) {
+		return _("Trim");
+	} else if (param.type() == MuteAutomation) {
+		return _("Mute");
 	} else if (param.type() == MidiCCAutomation) {
-		return string_compose("%1: %2 [%3]",
-				param.id() + 1, midi_name(param.id()), int(param.channel()) + 1);
+		return string_compose("Controller %1 [%2]", param.id(), int(param.channel()) + 1);
 	} else if (param.type() == MidiPgmChangeAutomation) {
 		return string_compose("Program [%1]", int(param.channel()) + 1);
 	} else if (param.type() == MidiPitchBenderAutomation) {
 		return string_compose("Bender [%1]", int(param.channel()) + 1);
 	} else if (param.type() == MidiChannelPressureAutomation) {
 		return string_compose("Pressure [%1]", int(param.channel()) + 1);
+	} else if (param.type() == MidiNotePressureAutomation) {
+		return string_compose("PolyPressure [%1]", int(param.channel()) + 1);
+#ifdef LV2_SUPPORT
+	} else if (param.type() == PluginPropertyAutomation) {
+		return string_compose("Property %1", URIMap::instance().id_to_uri(param.id()));
+#endif
 	} else {
 		return EventTypeMap::instance().to_symbol(param);
 	}
@@ -203,33 +215,17 @@ Automatable::can_automate (Evoral::Parameter what)
 	_can_automate_list.insert (what);
 }
 
-void
-Automatable::mark_automation_visible (Evoral::Parameter what, bool yn)
-{
-	if (yn) {
-		_visible_controls.insert (what);
-	} else {
-		set<Evoral::Parameter>::iterator i;
-
-		if ((i = _visible_controls.find (what)) != _visible_controls.end()) {
-			_visible_controls.erase (i);
-		}
-	}
-}
-
 /** \a legacy_param is used for loading legacy sessions where an object (IO, Panner)
  * had a single automation parameter, with it's type implicit.  Derived objects should
  * pass that type and it will be used for the untyped AutomationList found.
  */
 int
-Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy_param)
+Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter legacy_param)
 {
-	Glib::Mutex::Lock lm (control_lock());
+	Glib::Threads::Mutex::Lock lm (control_lock());
 
 	/* Don't clear controls, since some may be special derived Controllable classes */
 
-	_visible_controls.clear ();
-
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;
 
@@ -242,10 +238,10 @@ Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy
 
 		if ((*niter)->name() == "AutomationList") {
 
-			const XMLProperty* id_prop = (*niter)->property("automation-id");
+			XMLProperty const * id_prop = (*niter)->property("automation-id");
 
 			Evoral::Parameter param = (id_prop
-					? EventTypeMap::instance().new_parameter(id_prop->value())
+					? EventTypeMap::instance().from_symbol(id_prop->value())
 					: legacy_param);
 
 			if (param.type() == NullAutomation) {
@@ -253,46 +249,56 @@ Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy
 				continue;
 			}
 
-			boost::shared_ptr<AutomationList> al (new AutomationList(**niter, param));
-
 			if (!id_prop) {
 				warning << "AutomationList node without automation-id property, "
 					<< "using default: " << EventTypeMap::instance().to_symbol(legacy_param) << endmsg;
 			}
 
-			boost::shared_ptr<Evoral::Control> existing = control(param);
+			if (_can_automate_list.find (param) == _can_automate_list.end ()) {
+				boost::shared_ptr<AutomationControl> actl = automation_control (param);
+				if (actl && (*niter)->children().size() > 0 && Config->get_limit_n_automatables () > 0) {
+					actl->set_flags (Controllable::Flag ((int)actl->flags() & ~Controllable::NotAutomatable));
+					can_automate (param);
+					info << "Marked parmater as automatable" << endl;
+				} else {
+					warning << "Ignored automation data for non-automatable parameter" << endl;
+					continue;
+				}
+			}
+
+
+			boost::shared_ptr<AutomationControl> existing = automation_control (param);
+
 			if (existing) {
-				existing->set_list(al);
+				existing->alist()->set_state (**niter, 3000);
 			} else {
-			    boost::shared_ptr<Evoral::Control> newcontrol = control_factory(param);
-				add_control(newcontrol);
+				boost::shared_ptr<Evoral::Control> newcontrol = control_factory(param);
+				add_control (newcontrol);
+				boost::shared_ptr<AutomationList> al (new AutomationList(**niter, param));
 				newcontrol->set_list(al);
 			}
 
 		} else {
-			error << "Expected AutomationList node, got '" << (*niter)->name() << endmsg;
+			error << "Expected AutomationList node, got '" << (*niter)->name() << "'" << endmsg;
 		}
 	}
 
-	_last_automation_snapshot = 0;
-
 	return 0;
 }
 
 XMLNode&
-Automatable::get_automation_state ()
+Automatable::get_automation_xml_state ()
 {
-	Glib::Mutex::Lock lm (control_lock());
-	XMLNode* node = new XMLNode (X_("Automation"));
+	Glib::Threads::Mutex::Lock lm (control_lock());
+	XMLNode* node = new XMLNode (Automatable::xml_node_name);
 
 	if (controls().empty()) {
 		return *node;
 	}
 
 	for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
-		boost::shared_ptr<AutomationList> l
-				= boost::dynamic_pointer_cast<AutomationList>(li->second->list());
-		if (!l->empty()) {
+		boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(li->second->list());
+		if (l) {
 			node->add_child_nocopy (l->get_state ());
 		}
 	}
@@ -303,75 +309,38 @@ Automatable::get_automation_state ()
 void
 Automatable::set_parameter_automation_state (Evoral::Parameter param, AutoState s)
 {
-	Glib::Mutex::Lock lm (control_lock());
+	Glib::Threads::Mutex::Lock lm (control_lock());
 
-	boost::shared_ptr<Evoral::Control> c = control (param, true);
-	boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(c->list());
+	boost::shared_ptr<AutomationControl> c = automation_control (param, true);
 
-	if (s != l->automation_state()) {
-		l->set_automation_state (s);
+	if (c && (s != c->automation_state())) {
+		c->set_automation_state (s);
 		_a_session.set_dirty ();
+		AutomationStateChanged(); /* Emit signal */
 	}
 }
 
 AutoState
-Automatable::get_parameter_automation_state (Evoral::Parameter param, bool lock)
+Automatable::get_parameter_automation_state (Evoral::Parameter param)
 {
 	AutoState result = Off;
 
-	if (lock)
-		control_lock().lock();
-
-	boost::shared_ptr<Evoral::Control> c = control(param);
-	boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(c->list());
-
-	if (c)
-		result = l->automation_state();
-
-	if (lock)
-		control_lock().unlock();
-
-	return result;
-}
-
-void
-Automatable::set_parameter_automation_style (Evoral::Parameter param, AutoStyle s)
-{
-	Glib::Mutex::Lock lm (control_lock());
-
-	boost::shared_ptr<Evoral::Control> c = control(param, true);
-	boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(c->list());
-
-	if (s != l->automation_style()) {
-		l->set_automation_style (s);
-		_a_session.set_dirty ();
-	}
-}
-
-AutoStyle
-Automatable::get_parameter_automation_style (Evoral::Parameter param)
-{
-	Glib::Mutex::Lock lm (control_lock());
-
-	boost::shared_ptr<Evoral::Control> c = control(param);
-	boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(c->list());
+	boost::shared_ptr<AutomationControl> c = automation_control(param);
 
 	if (c) {
-		return l->automation_style();
-	} else {
-		return Absolute; // whatever
+		result = c->automation_state();
 	}
+
+	return result;
 }
 
 void
 Automatable::protect_automation ()
 {
 	typedef set<Evoral::Parameter> ParameterSet;
-	ParameterSet automated_params;
-
-	what_has_data(automated_params);
+	const ParameterSet& automated_params = what_can_be_automated ();
 
-	for (ParameterSet::iterator i = automated_params.begin(); i != automated_params.end(); ++i) {
+	for (ParameterSet::const_iterator i = automated_params.begin(); i != automated_params.end(); ++i) {
 
 		boost::shared_ptr<Evoral::Control> c = control(*i);
 		boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(c->list());
@@ -380,6 +349,8 @@ Automatable::protect_automation ()
 		case Write:
 			l->set_automation_state (Off);
 			break;
+		case Latch:
+			/* fall through */
 		case Touch:
 			l->set_automation_state (Play);
 			break;
@@ -390,83 +361,239 @@ Automatable::protect_automation ()
 }
 
 void
-Automatable::automation_snapshot (nframes_t now, bool force)
+Automatable::non_realtime_locate (samplepos_t now)
 {
-	if (force || _last_automation_snapshot > now || (now - _last_automation_snapshot) > _automation_interval) {
+	bool rolling = _a_session.transport_rolling ();
 
-		for (Controls::iterator i = controls().begin(); i != controls().end(); ++i) {
-			boost::shared_ptr<AutomationControl> c
-					= boost::dynamic_pointer_cast<AutomationControl>(i->second);
-			if (c->automation_write()) {
-				c->list()->rt_add (now, i->second->user_double());
+	for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
+
+		boost::shared_ptr<AutomationControl> c
+				= boost::dynamic_pointer_cast<AutomationControl>(li->second);
+		if (c) {
+			boost::shared_ptr<AutomationList> l
+				= boost::dynamic_pointer_cast<AutomationList>(c->list());
+
+			if (!l) {
+				continue;
+			}
+
+			bool am_touching = c->touching ();
+			if (rolling && am_touching) {
+			/* when locating while rolling, and writing automation,
+			 * start a new write pass.
+			 * compare to compare to non_realtime_transport_stop()
+			 */
+				const bool list_did_write = !l->in_new_write_pass ();
+				c->stop_touch (-1); // time is irrelevant
+				l->stop_touch (-1);
+				c->commit_transaction (list_did_write);
+				l->write_pass_finished (now, Config->get_automation_thinning_factor ());
+
+				if (l->automation_state () == Write) {
+					l->set_automation_state (Touch);
+				}
+				if (l->automation_playback ()) {
+					c->set_value_unchecked (c->list ()->eval (now));
+				}
+			}
+
+			l->start_write_pass (now);
+
+			if (rolling && am_touching) {
+				c->start_touch (now);
 			}
 		}
+	}
+}
+
+void
+Automatable::non_realtime_transport_stop (samplepos_t now, bool /*flush_processors*/)
+{
+	for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
+		boost::shared_ptr<AutomationControl> c =
+			boost::dynamic_pointer_cast<AutomationControl>(li->second);
+		if (!c) {
+			continue;
+		}
+
+		boost::shared_ptr<AutomationList> l =
+			boost::dynamic_pointer_cast<AutomationList>(c->list());
+		if (!l) {
+			continue;
+		}
+
+		/* Stop any active touch gesture just before we mark the write pass
+		   as finished.  If we don't do this, the transport can end up stopped with
+		   an AutomationList thinking that a touch is still in progress and,
+		   when the transport is re-started, a touch will magically
+		   be happening without it ever have being started in the usual way.
+		*/
+		const bool list_did_write = !l->in_new_write_pass ();
 
-		_last_automation_snapshot = now;
+		c->stop_touch (now);
+		l->stop_touch (now);
+
+		c->commit_transaction (list_did_write);
+
+		l->write_pass_finished (now, Config->get_automation_thinning_factor ());
+
+		if (l->automation_state () == Write) {
+			l->set_automation_state (Touch);
+		}
+
+		if (l->automation_playback ()) {
+			c->set_value_unchecked (c->list ()->eval (now));
+		}
 	}
 }
 
 void
-Automatable::transport_stopped (sframes_t now)
+Automatable::automation_run (samplepos_t start, pframes_t nframes, bool only_active)
 {
+	if (only_active) {
+		boost::shared_ptr<ControlList> cl = _automated_controls.reader ();
+		for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) {
+			(*ci)->automation_run (start, nframes);
+		}
+		return;
+	}
+
 	for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
+		boost::shared_ptr<AutomationControl> c =
+			boost::dynamic_pointer_cast<AutomationControl>(li->second);
+		if (!c) {
+			continue;
+		}
+		c->automation_run (start, nframes);
+	}
+}
 
-		boost::shared_ptr<AutomationControl> c
-				= boost::dynamic_pointer_cast<AutomationControl>(li->second);
-		boost::shared_ptr<AutomationList> l
-				= boost::dynamic_pointer_cast<AutomationList>(c->list());
+void
+Automatable::automation_list_automation_state_changed (Evoral::Parameter param, AutoState as)
+{
+	{
+		boost::shared_ptr<AutomationControl> c (automation_control(param));
+		assert (c && c->list());
 
-		c->list()->reposition_for_rt_add (now);
+		RCUWriter<ControlList> writer (_automated_controls);
+		boost::shared_ptr<ControlList> cl = writer.get_copy ();
 
-		if (c->automation_state() != Off) {
-			c->set_value(c->list()->eval(now));
+		ControlList::const_iterator fi = std::find (cl->begin(), cl->end(), c);
+		if (fi != cl->end()) {
+			cl->erase (fi);
+		}
+		switch (as) {
+			/* all potential  automation_playback() states */
+			case Play:
+			case Touch:
+			case Latch:
+				cl->push_back (c);
+				break;
+			case Off:
+			case Write:
+				break;
 		}
 	}
+	_automated_controls.flush();
 }
 
 boost::shared_ptr<Evoral::Control>
 Automatable::control_factory(const Evoral::Parameter& param)
 {
-	boost::shared_ptr<AutomationList> list(new AutomationList(param));
-	Evoral::Control* control = NULL;
+	Evoral::Control*                  control   = NULL;
+	bool                              make_list = true;
+	ParameterDescriptor               desc(param);
+	boost::shared_ptr<AutomationList> list;
+
 	if (param.type() >= MidiCCAutomation && param.type() <= MidiChannelPressureAutomation) {
 		MidiTrack* mt = dynamic_cast<MidiTrack*>(this);
 		if (mt) {
 			control = new MidiTrack::MidiControl(mt, param);
-		} else {
-			warning << "MidiCCAutomation for non-MidiTrack" << endl;
+			make_list = false;  // No list, this is region "automation"
 		}
 	} else if (param.type() == PluginAutomation) {
 		PluginInsert* pi = dynamic_cast<PluginInsert*>(this);
 		if (pi) {
-			control = new PluginInsert::PluginControl(pi, param);
+			pi->plugin(0)->get_parameter_descriptor(param.id(), desc);
+			control = new PluginInsert::PluginControl(pi, param, desc);
 		} else {
 			warning << "PluginAutomation for non-Plugin" << endl;
 		}
-	} else if (param.type() == GainAutomation) {
-		Amp* amp = dynamic_cast<Amp*>(this);
-		if (amp) {
-			control = new Amp::GainControl(X_("gaincontrol"), _a_session, amp, param);
+	} else if (param.type() == PluginPropertyAutomation) {
+		PluginInsert* pi = dynamic_cast<PluginInsert*>(this);
+		if (pi) {
+			desc = pi->plugin(0)->get_property_descriptor(param.id());
+			if (desc.datatype != Variant::NOTHING) {
+				if (!Variant::type_is_numeric(desc.datatype)) {
+					make_list = false;  // Can't automate non-numeric data yet
+				} else {
+					list = boost::shared_ptr<AutomationList>(new AutomationList(param, desc));
+				}
+				control = new PluginInsert::PluginPropertyControl(pi, param, desc, list);
+			}
 		} else {
-			warning << "GainAutomation for non-Amp" << endl;
+			warning << "PluginPropertyAutomation for non-Plugin" << endl;
 		}
-	} else if (param.type() == PanAutomation) {
-		Panner* me = dynamic_cast<Panner*>(this);
-		if (me) {
-			control = new Panner::PanControllable(me->session(), X_("panner"), *me, param);
+	} else if (param.type() == GainAutomation) {
+		control = new GainControl(_a_session, param);
+	} else if (param.type() == TrimAutomation) {
+		control = new GainControl(_a_session, param);
+	} else if (param.type() == PanAzimuthAutomation || param.type() == PanWidthAutomation || param.type() == PanElevationAutomation) {
+		Pannable* pannable = dynamic_cast<Pannable*>(this);
+		if (pannable) {
+			control = new PanControllable (_a_session, pannable->describe_parameter (param), pannable, param);
 		} else {
-			warning << "PanAutomation for non-Panner" << endl;
+			warning << "PanAutomation for non-Pannable" << endl;
+		}
+	} else if (param.type() == RecEnableAutomation) {
+		Recordable* re = dynamic_cast<Recordable*> (this);
+		if (re) {
+			control = new RecordEnableControl (_a_session, X_("recenable"), *re);
+		}
+	} else if (param.type() == MonitoringAutomation) {
+		Monitorable* m = dynamic_cast<Monitorable*>(this);
+		if (m) {
+			control = new MonitorControl (_a_session, X_("monitor"), *m);
+		}
+	} else if (param.type() == SoloAutomation) {
+		Soloable* s = dynamic_cast<Soloable*>(this);
+		Muteable* m = dynamic_cast<Muteable*>(this);
+		if (s && m) {
+			control = new SoloControl (_a_session, X_("solo"), *s, *m);
 		}
+	} else if (param.type() == MuteAutomation) {
+		Muteable* m = dynamic_cast<Muteable*>(this);
+		if (m) {
+			control = new MuteControl (_a_session, X_("mute"), *m);
+		}
+	}
+
+	if (make_list && !list) {
+		list = boost::shared_ptr<AutomationList>(new AutomationList(param, desc));
 	}
 
 	if (!control) {
-		control = new AutomationControl(_a_session, param);
+		control = new AutomationControl(_a_session, param, desc, list);
 	}
 
-	control->set_list(list);
 	return boost::shared_ptr<Evoral::Control>(control);
 }
 
+boost::shared_ptr<AutomationControl>
+Automatable::automation_control (PBD::ID const & id) const
+{
+	Controls::const_iterator li;
+
+	for (li = _controls.begin(); li != _controls.end(); ++li) {
+		boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> (li->second);
+		if (ac && (ac->id() == id)) {
+			return ac;
+		}
+	}
+
+	return boost::shared_ptr<AutomationControl>();
+}
+
 boost::shared_ptr<AutomationControl>
 Automatable::automation_control (const Evoral::Parameter& id, bool create)
 {
@@ -480,15 +607,62 @@ Automatable::automation_control (const Evoral::Parameter& id) const
 }
 
 void
-Automatable::automation_state_changed (Evoral::Parameter const & p)
+Automatable::clear_controls ()
+{
+	_control_connections.drop_connections ();
+	ControlSet::clear_controls ();
+}
+
+bool
+Automatable::find_next_event (double start, double end, Evoral::ControlEvent& next_event, bool only_active) const
 {
-	AutomationStateChanged (p); /* EMIT SIGNAL */
+	next_event.when = std::numeric_limits<double>::max();
+
+	if (only_active) {
+		boost::shared_ptr<ControlList> cl = _automated_controls.reader ();
+		for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) {
+			if ((*ci)->automation_playback()) {
+				find_next_ac_event (*ci, start, end, next_event);
+			}
+		}
+	} else {
+		for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
+			boost::shared_ptr<AutomationControl> c
+				= boost::dynamic_pointer_cast<AutomationControl>(li->second);
+			if (c) {
+				find_next_ac_event (c, start, end, next_event);
+			}
+		}
+	}
+	return next_event.when != std::numeric_limits<double>::max();
 }
 
 void
-Automatable::clear_controls ()
+Automatable::find_next_ac_event (boost::shared_ptr<AutomationControl> c, double start, double end, Evoral::ControlEvent& next_event) const
 {
-	_control_connections.drop_connections ();
-	ControlSet::clear_controls ();
+	boost::shared_ptr<SlavableAutomationControl> sc
+		= boost::dynamic_pointer_cast<SlavableAutomationControl>(c);
+
+	if (sc) {
+		sc->find_next_event (start, end, next_event);
+	}
+
+	Evoral::ControlList::const_iterator i;
+	boost::shared_ptr<const Evoral::ControlList> alist (c->list());
+	Evoral::ControlEvent cp (start, 0.0f);
+	if (!alist) {
+		return;
+	}
+
+	for (i = lower_bound (alist->begin(), alist->end(), &cp, Evoral::ControlList::time_comparator); i != alist->end() && (*i)->when < end; ++i) {
+		if ((*i)->when > start) {
+			break;
+		}
+	}
+
+	if (i != alist->end() && (*i)->when < end) {
+		if ((*i)->when < next_event.when) {
+			next_event.when = (*i)->when;
+		}
+	}
 }
-