X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_control.cc;h=2586a14b5841810d0891a1cbfd8a49167a7cf954;hb=07112b55e0bb7ceb9e5c05ab4df167ecaf7edd9b;hp=1460c42c7bd75420089b5f37c21657a5cf810e97;hpb=74933f58659051f6d4ef52d1103b2b7ba4643883;p=ardour.git

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 1460c42c7b..2586a14b58 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -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
@@ -19,8 +19,9 @@
 */
 
 #include <iostream>
-#include "ardour/automatable.h"
+
 #include "ardour/automation_control.h"
+#include "ardour/automation_watch.h"
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
 
@@ -28,43 +29,103 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-
 AutomationControl::AutomationControl(
 		ARDOUR::Session& session,
 		const Evoral::Parameter& parameter,
 		boost::shared_ptr<ARDOUR::AutomationList> list,
 		const string& name)
-	: Controllable((name != "") ? name : EventTypeMap::instance().to_symbol(parameter))
+	: Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name)
 	, Evoral::Control(parameter, list)
 	, _session(session)
 {
 }
 
+AutomationControl::~AutomationControl ()
+{
+}
 
-float
+/** Get the current effective `user' value based on automation state */
+double
 AutomationControl::get_value() const
 {
 	bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
-	return Control::get_float(from_list, _session.transport_frame());
+	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)
 {
-	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
 
-	Control::set_float(value, to_list, _session.transport_frame());
+
+                _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)
+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());
+}