change Controllable::set_value() API to include grouped control consideration.

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index f2361c2b30328efc85b48cbeecffe60e5845c461..583f38807d2e2b5836128d5099c6cb4347f8bc47 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -25,6 +25,7 @@
 #include "ardour/session.h"
 
 #include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
 
 #include "i18n.h"
 
@@ -48,6 +49,16 @@ AutomationControl::~AutomationControl ()
 {
 }
 
+bool
+AutomationControl::writable() const
+{
+       boost::shared_ptr<AutomationList> al = alist();
+       if (al) {
+               return al->automation_state() != Play;
+       }
+       return true;
+}
+
 /** Get the current effective `user' value based on automation state */
 double
 AutomationControl::get_value() const
@@ -61,7 +72,7 @@ AutomationControl::get_value() const
  *  @param value `user' value
  */
 void
-AutomationControl::set_value (double value)
+AutomationControl::set_value (double value, PBD::Controllable::GroupControlDisposition /* group_override */)
 {
        bool to_list = _list && ((AutomationList*)_list.get())->automation_write();
 
@@ -122,14 +133,9 @@ AutomationControl::start_touch(double when)
 
        if (!touching()) {
 
-               if (alist()->automation_state() == Write) {
-                       _before = &alist ()->get_state ();
-               }
-
                if (alist()->automation_state() == Touch) {
                        /* subtle. aligns the user value with the playback */
-                       set_value (get_value ());
-                       _before = &alist ()->get_state ();
+                       set_value (get_value (), Controllable::NoGroup);
                        alist()->start_touch (when);
                        if (!_desc.toggled) {
                                AutomationWatch::instance().add_automation_watch (shared_from_this());
@@ -146,22 +152,26 @@ AutomationControl::stop_touch(bool mark, double when)
        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 ();
+void
+AutomationControl::commit_transaction (bool did_write)
+{
+       if (did_write) {
+               if (alist ()->before ()) {
+                       _session.begin_reversible_command (string_compose (_("record %1 automation"), name ()));
+                       _session.commit_reversible_command (new MementoCommand<AutomationList> (*alist ().get (), alist ()->before (), &alist ()->get_state ()));
                }
+       } else {
+               alist ()->clear_history ();
        }
 }
 
@@ -177,7 +187,7 @@ AutomationControl::internal_to_interface (double val) const
 
        if (_desc.logarithmic) {
                if (val > 0) {
-                       val = pow (val, 1/1.5);
+                       val = pow (val, 1./2.0);
                } else {
                        val = 0;
                }
@@ -193,7 +203,7 @@ AutomationControl::interface_to_internal (double val) const
                if (val <= 0) {
                        val = 0;
                } else {
-                       val = pow (val, 1.5);
+                       val = pow (val, 2.0);
                }
        }