merge fix

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index bfa16f9e4aec743c9109721b6ac7293b34f4efce..bfb1046849887b83fa57a67d391efe99b4404896 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -19,12 +19,15 @@
 */
 
 #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;
@@ -85,6 +88,8 @@ AutomationControl::set_automation_state (AutoState as)
                }
 
                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()) {
@@ -113,9 +118,16 @@ AutomationControl::set_automation_style (AutoStyle 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);
                        if (!_desc.toggled) {
                                AutomationWatch::instance().add_automation_watch (shared_from_this());
@@ -131,11 +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);
                        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;
+}
+
+