X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fautomatable.h;h=5f9f7d2b91165d271145023178ad871aa85e1f80;hb=f485cfa324717f57b9f820f43f1b53307b96a8b9;hp=11fb48904c808e03115ca4cb77bc91424a39e4cc;hpb=2e27e21d3a09889311e18a8efe11abcaa6d9c8b3;p=ardour.git

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 11fb48904c..5f9f7d2b91 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -23,10 +23,15 @@
 #include <map>
 #include <set>
 #include <string>
+
 #include <boost/shared_ptr.hpp>
+
 #include "pbd/signals.h"
+
 #include "evoral/ControlSet.hpp"
+
 #include "ardour/libardour_visibility.h"
+#include "ardour/slavable.h"
 #include "ardour/types.h"
 
 class XMLNode;
@@ -39,7 +44,7 @@ class AutomationControl;
 /* The inherited ControlSet is virtual because AutomatableSequence inherits
  * from this AND EvoralSequence, which is also a ControlSet
  */
-class LIBARDOUR_API Automatable : virtual public Evoral::ControlSet
+class LIBARDOUR_API Automatable : virtual public Evoral::ControlSet, public Slavable
 {
 public:
 	Automatable(Session&);
@@ -47,16 +52,17 @@ public:
 
         virtual ~Automatable();
 
-	boost::shared_ptr<Evoral::Control>
-	control_factory(const Evoral::Parameter& id);
+	boost::shared_ptr<Evoral::Control> control_factory(const Evoral::Parameter& id);
 
-	boost::shared_ptr<AutomationControl>
-	automation_control (const Evoral::Parameter& id, bool create_if_missing=false);
+	boost::shared_ptr<AutomationControl> automation_control (const Evoral::Parameter& id) {
+		return automation_control (id, false);
+	}
 
-	boost::shared_ptr<const AutomationControl>
-	automation_control (const Evoral::Parameter& id) const;
+	boost::shared_ptr<AutomationControl> automation_control (const Evoral::Parameter& id, bool create_if_missing);
+	boost::shared_ptr<const AutomationControl> automation_control (const Evoral::Parameter& id) const;
 
 	virtual void add_control(boost::shared_ptr<Evoral::Control>);
+	virtual bool find_next_event (double start, double end, Evoral::ControlEvent& ev, bool only_active = true) const;
 	void clear_controls ();
 
         virtual void transport_located (framepos_t now);
@@ -81,6 +87,8 @@ public:
 	int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param);
 	XMLNode& get_automation_xml_state();
 
+	PBD::Signal0<void> AutomationStateChanged;
+
   protected:
 	Session& _a_session;