X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fautomatable.h;h=11fb48904c808e03115ca4cb77bc91424a39e4cc;hb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;hp=7bfd43ec022be6297152d96d64c29fd036054e08;hpb=c3a2f704c9226e2d871a91a3d9699b50ef82c7c8;p=ardour.git

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 7bfd43ec02..11fb48904c 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -24,7 +24,9 @@
 #include <set>
 #include <string>
 #include <boost/shared_ptr.hpp>
+#include "pbd/signals.h"
 #include "evoral/ControlSet.hpp"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 
 class XMLNode;
@@ -34,17 +36,16 @@ namespace ARDOUR {
 class Session;
 class AutomationControl;
 
-
-/** Note this class is abstract, actual objects must either be
- * an AutomatableControls or an AutomatableSequence
+/* The inherited ControlSet is virtual because AutomatableSequence inherits
+ * from this AND EvoralSequence, which is also a ControlSet
  */
-class Automatable : virtual public Evoral::ControlSet
+class LIBARDOUR_API Automatable : virtual public Evoral::ControlSet
 {
 public:
 	Automatable(Session&);
-	Automatable();
+	Automatable (const Automatable& other);
 
-	virtual ~Automatable() {}
+        virtual ~Automatable();
 
 	boost::shared_ptr<Evoral::Control>
 	control_factory(const Evoral::Parameter& id);
@@ -56,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 transport_located (framepos_t now);
+	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);
@@ -70,47 +73,30 @@ 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) {
-		return (_last_automation_snapshot > now
-				|| (now - _last_automation_snapshot) > _automation_interval);
-	}
-
-	static void set_automation_interval (jack_nframes_t frames) {
-		_automation_interval = frames;
-	}
-
-	static jack_nframes_t automation_interval() {
-		return _automation_interval;
-	}
+	static const std::string xml_node_name;
 
-	typedef Evoral::ControlSet::Controls Controls;
-
-	Evoral::ControlSet&       data()       { return *dynamic_cast<Evoral::ControlSet*>(this); }
-	const Evoral::ControlSet& data() const { return *dynamic_cast<const Evoral::ControlSet*>(this); }
-
-	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;
+
+private:
+	PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals
 };