Merge branch 'master' of https://github.com/nmains/ardour

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 05463dcdd0ce79e5b40145181a1fc8734904804c..2586a14b5841810d0891a1cbfd8a49167a7cf954 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -21,6 +21,7 @@
 #include <iostream>
 
 #include "ardour/automation_control.h"
+#include "ardour/automation_watch.h"
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
 
@@ -39,6 +40,10 @@ AutomationControl::AutomationControl(
 {
 }
 
+AutomationControl::~AutomationControl ()
+{
+}
+
 /** Get the current effective `user' value based on automation state */
 double
 AutomationControl::get_value() const
@@ -52,29 +57,75 @@ AutomationControl::get_value() const
  *  @param value `user' value
  */
 void
-AutomationControl::set_value(double value)
+AutomationControl::set_value (double value)
 {
-       bool to_list = _list && _session.transport_stopped()
-               && ((AutomationList*)_list.get())->automation_write();
+       bool to_list = _list && ((AutomationList*)_list.get())->automation_write();
 
         if (to_list && parameter().toggled()) {
 
                 // store the previous value just before this so any
                 // interpolation works right
 
+
                 _list->add (get_double(), _session.transport_frame()-1);
         }
 
-       Control::set_double (value, to_list, _session.transport_frame());
+       Control::set_double (value, _session.transport_frame(), to_list);
 
        Changed(); /* EMIT SIGNAL */
 }
 
-
 void
-AutomationControl::set_list(boost::shared_ptr<Evoral::ControlList> list)
+AutomationControl::set_list (boost::shared_ptr<Evoral::ControlList> list)
 {
-       Control::set_list(list);
+       Control::set_list (list);
        Changed();  /* EMIT SIGNAL */
 }
 
+void
+AutomationControl::set_automation_state (AutoState as)
+{
+       if (as != alist()->automation_state()) {
+
+               alist()->set_automation_state (as);
+
+               if (as == Write) {
+                       AutomationWatch::instance().add_automation_watch (shared_from_this());
+               } else if (as == Touch) {
+                       if (!touching()) {
+                               AutomationWatch::instance().remove_automation_watch (shared_from_this());
+                       } else {
+                               /* this seems unlikely, but the combination of
+                                * a control surface and the mouse could make
+                                * it possible to put the control into Touch
+                                * mode *while* touching it.
+                                */
+                               AutomationWatch::instance().add_automation_watch (shared_from_this());
+                       }
+               } else {
+                       AutomationWatch::instance().remove_automation_watch (shared_from_this());
+               }
+       }
+}
+
+void
+AutomationControl::set_automation_style (AutoStyle as)
+{
+       alist()->set_automation_style (as);
+}
+
+void
+AutomationControl::start_touch(double when)
+{
+       set_touching (true);
+       alist()->start_touch(when);
+       AutomationWatch::instance().add_automation_watch (shared_from_this());
+}
+
+void
+AutomationControl::stop_touch(bool mark, double when)
+{
+       set_touching (false);
+       alist()->stop_touch (mark, when);
+       AutomationWatch::instance().remove_automation_watch (shared_from_this());
+}