dramatic overhaul of automation. too long to explain here. this work is not finished - write/touch passes do not correctly overwrite existing data because the semantics of ControlList::insert_iterator need clarification. more to follow

git-svn-id: svn://localhost/ardour2/branches/3.0@13038 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 15 insertions, 16 deletions

diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index 2c15a1b1b0..10194b3f9b 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -22,6 +22,8 @@
 #define __ardour_automation_control_h__
 
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+
 #include "pbd/controllable.h"
 #include "evoral/Control.hpp"
 #include "ardour/automation_list.h"
@@ -34,7 +36,7 @@ class Automatable;
 
 /** A PBD::Controllable with associated automation data (AutomationList)
  */
-class AutomationControl : public PBD::Controllable, public Evoral::Control
+class AutomationControl : public PBD::Controllable, public Evoral::Control, public boost::enable_shared_from_this<AutomationControl>
 {
 public:
 	AutomationControl(ARDOUR::Session&,
@@ -42,37 +44,34 @@ public:
 			  boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(),
 			  const std::string& name="");
 
+        ~AutomationControl ();
+
 	boost::shared_ptr<AutomationList> alist() const {
 		return boost::dynamic_pointer_cast<AutomationList>(_list);
 	}
 
-	void set_list(boost::shared_ptr<Evoral::ControlList>);
+	void set_list (boost::shared_ptr<Evoral::ControlList>);
 
 	inline bool automation_playback() const {
-		return ((ARDOUR::AutomationList*)_list.get())->automation_playback();
+		return alist()->automation_playback();
 	}
 
 	inline bool automation_write() const {
-		return ((ARDOUR::AutomationList*)_list.get())->automation_write();
+		return alist()->automation_write();
 	}
 
 	inline AutoState automation_state() const {
-		return ((ARDOUR::AutomationList*)_list.get())->automation_state();
+		return alist()->automation_state();
 	}
 
-	inline void set_automation_state(AutoState as) {
-		return ((ARDOUR::AutomationList*)_list.get())->set_automation_state(as);
+	inline AutoStyle automation_style() const {
+		return alist()->automation_style();
 	}
 
-	inline void start_touch(double when) {
-		set_touching (true);
-		return ((ARDOUR::AutomationList*)_list.get())->start_touch(when);
-	}
-
-	inline void stop_touch(bool mark, double when) {
-		set_touching (false);
-		return ((ARDOUR::AutomationList*)_list.get())->stop_touch(mark, when);
-	}
+        void set_automation_state(AutoState as);
+        void set_automation_style(AutoStyle as);
+        void start_touch (double when);
+        void stop_touch (bool mark, double when);
 
 	void set_value (double);
 	double get_value () const;