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 bbeec65669e0f3130497971f251b52aef5e1baed..2586a14b5841810d0891a1cbfd8a49167a7cf954 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2007 Paul Davis 
-    Author: Dave Robillard
+    Copyright (C) 2007 Paul Davis
+    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
@@ -19,73 +19,113 @@
 */
 
 #include <iostream>
-#include <ardour/automation_control.h>
-#include <ardour/session.h>
-#include <ardour/automatable.h>
+
+#include "ardour/automation_control.h"
+#include "ardour/automation_watch.h"
+#include "ardour/event_type_map.h"
+#include "ardour/session.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-
-AutomationControl::AutomationControl(Session& session, boost::shared_ptr<AutomationList> list, string name)
-       : Controllable((name == "unnamed controllable") ? list->parameter().to_string() : name)
+AutomationControl::AutomationControl(
+               ARDOUR::Session& session,
+               const Evoral::Parameter& parameter,
+               boost::shared_ptr<ARDOUR::AutomationList> list,
+               const string& name)
+       : Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name)
+       , Evoral::Control(parameter, list)
        , _session(session)
-       , _list(list)
-       , _user_value(list->default_value())
 {
-       cerr << "Created AutomationControl " << name << "(" << list->parameter().to_string() << ")" << endl;
 }
 
+AutomationControl::~AutomationControl ()
+{
+}
 
-/** Get the currently effective value (ie the one that corresponds to current output)
- */
-float
+/** Get the current effective `user' value based on automation state */
+double
 AutomationControl::get_value() const
 {
-       if (_list->automation_playback())
-               return _list->eval(_session.transport_frame());
-       else
-               return _user_value;
+       bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
+       return Control::get_double (from_list, _session.transport_frame());
 }
 
-
+/** Set the value and do the right thing based on automation state
+ *  (e.g. record if necessary, etc.)
+ *  @param value `user' value
+ */
 void
-AutomationControl::set_value(float value)
+AutomationControl::set_value (double value)
 {
-       _user_value = value;
-       
-       if (_session.transport_stopped() && _list->automation_write())
-               _list->add(_session.transport_frame(), value);
+       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, _session.transport_frame(), to_list);
 
        Changed(); /* EMIT SIGNAL */
 }
 
+void
+AutomationControl::set_list (boost::shared_ptr<Evoral::ControlList> list)
+{
+       Control::set_list (list);
+       Changed();  /* EMIT SIGNAL */
+}
 
-/** Get the latest user-set value, which may not equal get_value() when automation
- * is playing back, etc.
- *
- * Automation write/touch works by periodically sampling this value and adding it
- * to the AutomationList.
- */
-float
-AutomationControl::user_value() const
+void
+AutomationControl::set_automation_state (AutoState as)
 {
-       return _user_value;
+       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_list(boost::shared_ptr<ARDOUR::AutomationList> list)
+AutomationControl::set_automation_style (AutoStyle as)
 {
-       _list = list;
-       _user_value = list->default_value();
-       Changed();  /* EMIT SIGNAL */
+       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());
 }
 
-       
-Parameter
-AutomationControl::parameter() const
+void
+AutomationControl::stop_touch(bool mark, double when)
 {
-       return _list->parameter();
+       set_touching (false);
+       alist()->stop_touch (mark, when);
+       AutomationWatch::instance().remove_automation_watch (shared_from_this());
 }