X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_control.cc;h=bfb1046849887b83fa57a67d391efe99b4404896;hb=46c83693284ece4a732d26e62113ea4ac584d539;hp=f1305609ef009862bff6f827d5d8348091a31957;hpb=d34bd9e6a04bcf9093a2a4864afce32f7db441bb;p=ardour.git

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index f1305609ef..bfb1046849 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -19,24 +19,28 @@
 */
 
 #include <iostream>
-
 #include "ardour/automation_control.h"
 #include "ardour/automation_watch.h"
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
 
+#include "pbd/memento_command.h"
+
+#include "i18n.h"
+
 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)
+AutomationControl::AutomationControl(ARDOUR::Session&                          session,
+                                     const Evoral::Parameter&                  parameter,
+                                     const ParameterDescriptor&                desc,
+                                     boost::shared_ptr<ARDOUR::AutomationList> list,
+                                     const string&                             name)
 	: Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name)
-	, Evoral::Control(parameter, list)
+	, Evoral::Control(parameter, desc, list)
 	, _session(session)
+	, _desc(desc)
 {
 }
 
@@ -61,15 +65,6 @@ AutomationControl::set_value (double 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 */
@@ -88,8 +83,13 @@ AutomationControl::set_automation_state (AutoState as)
 	if (_list && as != alist()->automation_state()) {
 
 		alist()->set_automation_state (as);
+		if (_desc.toggled) {
+			return;  // No watch for boolean automation
+		}
 
 		if (as == Write) {
+			/* get state for undo */
+			_before = &alist ()->get_state ();
 			AutomationWatch::instance().add_automation_watch (shared_from_this());
 		} else if (as == Touch) {
 			if (!touching()) {
@@ -111,17 +111,27 @@ AutomationControl::set_automation_state (AutoState as)
 void
 AutomationControl::set_automation_style (AutoStyle as)
 {
+	if (!_list) return;
 	alist()->set_automation_style (as);
 }
 
 void
 AutomationControl::start_touch(double when)
 {
-	if (!_list) return;
+	if (!_list) {
+		return;
+	}
+
 	if (!touching()) {
+
 		if (alist()->automation_state() == Touch) {
+			/* subtle. aligns the user value with the playback */
+			set_value (get_value ());
+			_before = &alist ()->get_state ();
 			alist()->start_touch (when);
-			AutomationWatch::instance().add_automation_watch (shared_from_this());
+			if (!_desc.toggled) {
+				AutomationWatch::instance().add_automation_watch (shared_from_this());
+			}
 		}
 		set_touching (true);
 	}
@@ -133,9 +143,68 @@ AutomationControl::stop_touch(bool mark, double when)
 	if (!_list) return;
 	if (touching()) {
 		set_touching (false);
+
+		if (alist()->automation_state() == Write) {
+			_session.begin_reversible_command (string_compose (_("write %1 automation"), name ()));
+			_session.add_command (new MementoCommand<AutomationList> (*alist ().get (), _before, &alist ()->get_state ()));
+			_session.commit_reversible_command ();
+		}
+
 		if (alist()->automation_state() == Touch) {
 			alist()->stop_touch (mark, when);
-			AutomationWatch::instance().remove_automation_watch (shared_from_this());
+			if (!_desc.toggled) {
+				AutomationWatch::instance().remove_automation_watch (shared_from_this());
+			}
+
+			_session.begin_reversible_command (string_compose (_("touch %1 automation"), name ()));
+			_session.add_command (new MementoCommand<AutomationList> (*alist ().get (), _before, &alist ()->get_state ()));
+			_session.commit_reversible_command ();
 		}
 	}
 }
+
+double
+AutomationControl::internal_to_interface (double val) const
+{
+	if (_desc.integer_step) {
+		// both upper and lower are inclusive.
+		val =  (val - lower()) / (1 + upper() - lower());
+	} else {
+		val =  (val - lower()) / (upper() - lower());
+	}
+
+	if (_desc.logarithmic) {
+		if (val > 0) {
+			val = pow (val, 1/1.5);
+		} else {
+			val = 0;
+		}
+	}
+
+	return val;
+}
+
+double
+AutomationControl::interface_to_internal (double val) const
+{
+	if (_desc.logarithmic) {
+		if (val <= 0) {
+			val = 0;
+		} else {
+			val = pow (val, 1.5);
+		}
+	}
+
+	if (_desc.integer_step) {
+		val =  lower() + val * (1 + upper() - lower());
+	} else {
+		val =  lower() + val * (upper() - lower());
+	}
+
+	if (val < lower()) val = lower();
+	if (val > upper()) val = upper();
+
+	return val;
+}
+
+