X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fautomation_control.h;h=10194b3f9be6bf25175d4b1184648e9b91e468c4;hb=5cf1f7f3b28abd36f9390014016def94f4e1468d;hp=f9b21b932c9e8d7351206510c7f96683dd4de772;hpb=3b89d9eaa03406a5e03648f47734211f09b89d62;p=ardour.git

diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index f9b21b932c..10194b3f9b 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2007 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     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
@@ -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,56 +36,67 @@ 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&,
 			  const Evoral::Parameter& parameter,
 			  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() {
-		set_touching (true);
-		return ((ARDOUR::AutomationList*)_list.get())->start_touch();
+
+        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;
+
+	virtual double internal_to_interface (double v) const {
+		return v;
 	}
 	
-	inline void stop_touch() {
-		set_touching (false);
-		return ((ARDOUR::AutomationList*)_list.get())->stop_touch();
+	virtual double interface_to_internal (double v) const {
+		return v;
+	}
+
+	virtual double internal_to_user (double v) const {
+		return v;
 	}
 
-	/** Set the value and do the right thing based on automation state
-	 * (e.g. record if necessary, etc.)
-	 */
-	void set_value(float val);
+	double lower() const { return parameter().min(); }
+	double upper() const { return parameter().max(); }
+	double normal() const { return parameter().normal(); }
+	bool toggled() const { return parameter().toggled(); }
 
-	/** Get the current effective value based on automation state.
-	 */
-	float get_value() const;
+	const ARDOUR::Session& session() const { return _session; }
 
 protected:
+
 	ARDOUR::Session& _session;
 };