X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fautomatable.h;h=f90f1dec4867fd781e9e5a5129118c7aa99b0a96;hb=ba0458cf1f6c69366e89631d8fff916ad183d768;hp=837bbbc61748e1f460074bf07eb5e387f87e4f77;hpb=e14187aadd574d46c82d8eb0d151b526b84ddcc7;p=ardour.git

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 837bbbc617..f90f1dec48 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,15 +20,15 @@
 #ifndef __ardour_automatable_h__
 #define __ardour_automatable_h__
 
-#include <set>
 #include <map>
+#include <set>
+#include <string>
 #include <boost/shared_ptr.hpp>
-#include <ardour/session_object.h>
-#include <ardour/automation_list.h>
-#include <ardour/automation_control.h>
-#include <ardour/parameter.h>
-#include <evoral/ControlSet.hpp>
-#include <evoral/Sequence.hpp>
+#include "pbd/signals.h"
+#include "evoral/ControlSet.hpp"
+#include "ardour/types.h"
+
+class XMLNode;
 
 namespace ARDOUR {
 
@@ -43,6 +43,7 @@ class Automatable : virtual public Evoral::ControlSet
 {
 public:
 	Automatable(Session&);
+        Automatable (const Automatable& other);
 	Automatable();
 
 	virtual ~Automatable() {}
@@ -50,78 +51,69 @@ public:
 	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<const AutomationControl>
+	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);
-	bool should_snapshot (nframes_t now) {
-		return (_last_automation_snapshot > now || (now - _last_automation_snapshot) > _automation_interval);
-	}
-	virtual void transport_stopped(nframes_t now);
+	virtual void transport_stopped (framepos_t now);
 
-	virtual string describe_parameter(Parameter param);
-	
-	AutoState get_parameter_automation_state (Parameter param, bool lock = true);
-	virtual void set_parameter_automation_state (Parameter param, AutoState);
-	
-	AutoStyle get_parameter_automation_style (Parameter param);
-	void set_parameter_automation_style (Parameter param, AutoStyle);
+	virtual std::string describe_parameter(Evoral::Parameter param);
+
+	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<Parameter>&) const;
-	const std::set<Parameter>& what_can_be_automated() const { return _can_automate_list; }
+	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 mark_automation_visible(Evoral::Parameter, bool);
+
+	inline bool should_snapshot (nframes_t now) {
+		return (_last_automation_snapshot > now
+				|| (now - _last_automation_snapshot) > _automation_interval);
+	}
 
-	void mark_automation_visible(Parameter, bool);
-	
 	static void set_automation_interval (jack_nframes_t frames) {
 		_automation_interval = frames;
 	}
 
-	static jack_nframes_t automation_interval() { 
+	static jack_nframes_t automation_interval() {
 		return _automation_interval;
 	}
-	
+
 	typedef Evoral::ControlSet::Controls Controls;
-	
-	Evoral::ControlSet&       data()       { return *this; }
-	const Evoral::ControlSet& data() const { return *this; }
 
-protected:
+	int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param);
+	XMLNode& get_automation_xml_state();
+	
+  protected:
 	Session& _a_session;
 
-	void can_automate(Parameter);
+	void can_automate(Evoral::Parameter);
 
-	virtual void auto_state_changed (Parameter which) {}
+	virtual void automation_list_automation_state_changed (Evoral::Parameter, AutoState) {}
 
-	int set_automation_state(const XMLNode&, Parameter default_param);
-	XMLNode& get_automation_state();
-	
 	int load_automation (const std::string& path);
 	int old_set_automation_state(const XMLNode&);
 
-	std::set<Parameter> _visible_controls;
-	std::set<Parameter> _can_automate_list;
-	
+	std::set<Evoral::Parameter> _visible_controls;
+	std::set<Evoral::Parameter> _can_automate_list;
+
 	nframes_t        _last_automation_snapshot;
 	static nframes_t _automation_interval;
-};
-
 
-/** Contains notes and controllers */
-class AutomatableSequence : public Automatable, public Evoral::Sequence {
-public:
-	AutomatableSequence(Session& s, size_t size)
-		: Evoral::ControlSet()
-		, Automatable(s)
-		, Evoral::Sequence(size)
-	{}
-};
-
-
-/** Contains only controllers */
-class AutomatableControls : public Automatable {
-public:
-	AutomatableControls(Session& s) : Evoral::ControlSet(), Automatable(s) {}
+private:
+	PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals
 };