X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fautomatable.h;h=f90f1dec4867fd781e9e5a5129118c7aa99b0a96;hb=90172686b92b53cc5ab1d60c0e6daecb65d17d3d;hp=3236d816c315447725ae0e097ddf9d5648f8580a;hpb=8d64ce26c4f6f7817958772c7593b9aac4b90db3;p=ardour.git

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 3236d816c3..f90f1dec48 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -24,6 +24,7 @@
 #include <set>
 #include <string>
 #include <boost/shared_ptr.hpp>
+#include "pbd/signals.h"
 #include "evoral/ControlSet.hpp"
 #include "ardour/types.h"
 
@@ -42,6 +43,7 @@ class Automatable : virtual public Evoral::ControlSet
 {
 public:
 	Automatable(Session&);
+        Automatable (const Automatable& other);
 	Automatable();
 
 	virtual ~Automatable() {}
@@ -56,13 +58,14 @@ public:
 	automation_control (const Evoral::Parameter& id) const;
 
 	virtual void add_control(boost::shared_ptr<Evoral::Control>);
+	void clear_controls ();
 
 	virtual void automation_snapshot(nframes_t now, bool force);
-	virtual void transport_stopped (sframes_t now);
+	virtual void transport_stopped (framepos_t now);
 
 	virtual std::string describe_parameter(Evoral::Parameter param);
 
-	AutoState get_parameter_automation_state (Evoral::Parameter param, bool lock = true);
+	AutoState get_parameter_automation_state (Evoral::Parameter param);
 	virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);
 
 	AutoStyle get_parameter_automation_style (Evoral::Parameter param);
@@ -90,15 +93,15 @@ public:
 
 	typedef Evoral::ControlSet::Controls Controls;
 
-	int set_automation_state (const XMLNode&, Evoral::Parameter default_param);
-	XMLNode& get_automation_state();
-
+	int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param);
+	XMLNode& get_automation_xml_state();
+	
   protected:
 	Session& _a_session;
 
 	void can_automate(Evoral::Parameter);
 
-	virtual void auto_state_changed (Evoral::Parameter /*which*/) {}
+	virtual void automation_list_automation_state_changed (Evoral::Parameter, AutoState) {}
 
 	int load_automation (const std::string& path);
 	int old_set_automation_state(const XMLNode&);
@@ -108,6 +111,9 @@ public:
 
 	nframes_t        _last_automation_snapshot;
 	static nframes_t _automation_interval;
+
+private:
+	PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals
 };