X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fautomatable.h;h=8adfb88aaeea999fce649ac31a8d36e9382f9d8d;hb=37905d82a611a09342faf52d01378c9b4e86a2ac;hp=1abfb4faf164acbb55da6921e9c0236d17c8ea1f;hpb=d116af22db3c0e0cf6aeff6194a689d8bfad7c8c;p=ardour.git

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 1abfb4faf1..8adfb88aae 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -23,9 +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;
@@ -35,69 +41,68 @@ 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 Slavable
 {
 public:
 	Automatable(Session&);
-        Automatable (const Automatable& other);
+	Automatable (const Automatable& other);
 
-	virtual ~Automatable() {}
+        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 (PBD::ID const & id) const;
+	/* derived classes need to provide some way to search their own child
+	   automatable's for a control. normally, we'd just make the method
+	   above virtual, and let them override it. But that wouldn't
+	   differentiate the "check children" and "just your own" cases.
 
-	boost::shared_ptr<const AutomationControl>
-	automation_control (const Evoral::Parameter& id) const;
+	   We could theoretically just overload the above method with an extra
+	   "bool recurse = default", but the rules of name hiding for C++ mean
+	   that making a method virtual will hide other overloaded versions of
+	   the same name. This means that virtual automation_control (PBD::ID
+	   const &) would hide automation_control (Evoral::Parameter const &
+	   id).
+
+	   So, skip around all that with a different name.
+	*/
+	virtual boost::shared_ptr<AutomationControl> automation_control_recurse (PBD::ID const & id) const {
+		return automation_control (id);
+	}
+
+	boost::shared_ptr<AutomationControl> automation_control (const Evoral::Parameter& id) {
+		return automation_control (id, false);
+	}
+	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 automation_snapshot (framepos_t now, bool force);
+        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);
 	virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);
 
-	AutoStyle get_parameter_automation_style (Evoral::Parameter param);
-	void set_parameter_automation_style (Evoral::Parameter param, AutoStyle);
-
 	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 (framepos_t now) {
-		return (_last_automation_snapshot > now
-				|| (now - _last_automation_snapshot) > _automation_interval);
-	}
-
-	static void set_automation_interval (framecnt_t frames) {
-		_automation_interval = frames;
-	}
-
-	static framecnt_t automation_interval() {
-		return _automation_interval;
-	}
-
-	typedef Evoral::ControlSet::Controls Controls;
-
-        static const std::string xml_node_name;
+	static const std::string xml_node_name;
 
 	int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param);
 	XMLNode& get_automation_xml_state();
-	
+
+	PBD::Signal0<void> AutomationStateChanged;
+
   protected:
 	Session& _a_session;
 
@@ -108,11 +113,9 @@ public:
 	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;
 
 	framepos_t _last_automation_snapshot;
-	static framecnt_t _automation_interval;
 
 private:
 	PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals