Fix my name :)

[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 3f22e6d57fd295460de12aeadd92636cbc7e60a0..44104b020ccc8be72fbd93496d4c62a0b9cc048b 100644 (file)
--- 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,9 +22,9 @@
 #define __ardour_automation_control_h__
 
 #include <boost/shared_ptr.hpp>
-#include <pbd/controllable.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 {
 
@@ -40,46 +40,60 @@ public:
        AutomationControl(ARDOUR::Session&,
                        const Evoral::Parameter& parameter,
                        boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(),
-                       const string& name="");
-       
-       boost::shared_ptr<AutomationList> alist() const { return boost::dynamic_pointer_cast<AutomationList>(_list); }
+                       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() 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() {
-               return ((ARDOUR::AutomationList*)_list.get())->start_touch();
+
+       inline void start_touch(double when) {
+               set_touching (true);
+               return ((ARDOUR::AutomationList*)_list.get())->start_touch(when);
        }
-       
-       inline void stop_touch() {
-               return ((ARDOUR::AutomationList*)_list.get())->stop_touch();
+
+       inline void stop_touch(bool mark, double when) {
+               set_touching (false);
+               return ((ARDOUR::AutomationList*)_list.get())->stop_touch(mark, when);
        }
 
-       /** Set the value and do the right thing based on automation state
-        * (e.g. record if necessary, etc.)
-        */
-       void set_value(float val);
+       void set_value (double);
+       double get_value () const;
 
-       /** Get the current effective value based on automation state.
-        */
-       float get_value() const;
+        double lower() const { return parameter().min(); }
+        double upper() const { return parameter().max(); }
 
+        const ARDOUR::Session& session() const { return _session; }
+
+       /** Convert user values to UI values.  See pbd/controllable.h */
+       virtual double user_to_ui (double val) const {
+               return val;
+       }
+
+       /** Convert UI values to user values.  See pbd/controllable.h */
+       virtual double ui_to_user (double val) const {
+               return val;
+       }
+       
 protected:
+       
        ARDOUR::Session& _session;
 };