make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

[ardour.git] / libs / ardour / ardour / automation_control.h

diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index 24d1db3eec5840232877682a287027839e969af3..15bac5fef863c2d40f182389241af4b95c30674f 100644 (file)
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -22,52 +22,65 @@
 #define __ardour_automation_control_h__
 
 #include <boost/shared_ptr.hpp>
-#include <pbd/controllable.h>
-#include <ardour/parameter.h>
-#include <evoral/Control.hpp>
-#include <ardour/automation_list.h>
+#include "pbd/controllable.h"
+#include "evoral/Control.hpp"
+#include "ardour/automation_list.h"
 
 namespace ARDOUR {
 
-class AutomationList;
 class Session;
 class Automatable;
 
 
-/** A PBD:Controllable with associated automation data (AutomationList)
+/** A PBD::Controllable with associated automation data (AutomationList)
  */
 class AutomationControl : public PBD::Controllable, public Evoral::Control
 {
 public:
        AutomationControl(ARDOUR::Session&,
-                       boost::shared_ptr<ARDOUR::AutomationList>,
-                       std::string name="unnamed controllable");
-       
-       boost::shared_ptr<AutomationList> alist() { return boost::dynamic_pointer_cast<AutomationList>(_list); }
+                       const Evoral::Parameter& parameter,
+                       boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(),
+                       const std::string& name="");
+
+       boost::shared_ptr<AutomationList> alist() const {
+               return boost::dynamic_pointer_cast<AutomationList>(_list);
+       }
 
        void set_list(boost::shared_ptr<Evoral::ControlList>);
 
        inline bool automation_playback() const {
                return ((ARDOUR::AutomationList*)_list.get())->automation_playback();
        }
-       
+
        inline bool automation_write() const {
                return ((ARDOUR::AutomationList*)_list.get())->automation_write();
        }
-       
-       inline AutoState automation_state() {
+
+       inline AutoState automation_state() const {
                return ((ARDOUR::AutomationList*)_list.get())->automation_state();
        }
-       
+
+       inline void set_automation_state(AutoState as) {
+               return ((ARDOUR::AutomationList*)_list.get())->set_automation_state(as);
+       }
+
        inline void start_touch() {
+               set_touching (true);
                return ((ARDOUR::AutomationList*)_list.get())->start_touch();
        }
-       
+
        inline void stop_touch() {
+               set_touching (false);
                return ((ARDOUR::AutomationList*)_list.get())->stop_touch();
        }
 
+       /** Set the value and do the right thing based on automation state
+        * (e.g. record if necessary, etc.)
+        */
        void set_value(float val);
+
+       /** Get the current effective value based on automation state.
+        */
        float get_value() const;
 
 protected: