X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fautomatable.h;h=dc86c0cdddc5298f9924d08eedc6b4b2e71a2465;hb=da9b82732eed632d8b940818382f7eb369100964;hp=9b83705b0a02e28a124a80b28c44c3f79aab2e05;hpb=e258b2622a4386b405c2216d79b34887c3ed55bf;p=ardour.git

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 9b83705b0a..dc86c0cddd 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,8 +43,7 @@ class Automatable : virtual public Evoral::ControlSet
 {
 public:
 	Automatable(Session&);
-        Automatable (const Automatable& other);
-	Automatable();
+	Automatable (const Automatable& other);
 
 	virtual ~Automatable() {}
 
@@ -57,13 +57,15 @@ 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 automation_snapshot (framepos_t now, bool force);
+	virtual void transport_stopped (framepos_t now);
 
 	virtual std::string describe_parameter(Evoral::Parameter param);
+	virtual std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
 
-	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);
@@ -71,44 +73,44 @@ public:
 
 	void protect_automation ();
 
-	void what_has_visible_data(std::set<Evoral::Parameter>&) const;
 	const std::set<Evoral::Parameter>& what_can_be_automated() const { return _can_automate_list; }
+	void what_has_existing_automation (std::set<Evoral::Parameter>&) const;
 
-	void mark_automation_visible(Evoral::Parameter, bool);
-
-	inline bool should_snapshot (nframes_t now) {
+	inline bool should_snapshot (framepos_t now) {
 		return (_last_automation_snapshot > now
 				|| (now - _last_automation_snapshot) > _automation_interval);
 	}
 
-	static void set_automation_interval (jack_nframes_t frames) {
+	static void set_automation_interval (framecnt_t frames) {
 		_automation_interval = frames;
 	}
 
-	static jack_nframes_t automation_interval() {
+	static framecnt_t automation_interval() {
 		return _automation_interval;
 	}
 
-	typedef Evoral::ControlSet::Controls Controls;
+	static const std::string xml_node_name;
 
-	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&);
 
-	std::set<Evoral::Parameter> _visible_controls;
 	std::set<Evoral::Parameter> _can_automate_list;
 
-	nframes_t        _last_automation_snapshot;
-	static nframes_t _automation_interval;
+	framepos_t _last_automation_snapshot;
+	static framecnt_t _automation_interval;
+
+private:
+	PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals
 };