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 0e2355e708947ffdabd0ba6aa87520fe39cf6c47..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();
 
@@ -124,7 +135,7 @@ AutomationControl::start_touch(double when)
 
                if (alist()->automation_state() == Touch) {
                        /* subtle. aligns the user value with the playback */
-                       set_value (get_value ());
+                       set_value (get_value (), Controllable::NoGroup);
                        alist()->start_touch (when);
                        if (!_desc.toggled) {
                                AutomationWatch::instance().add_automation_watch (shared_from_this());
@@ -152,11 +163,15 @@ AutomationControl::stop_touch(bool mark, double when)
 }
 
 void
-AutomationControl::commit_transaction ()
+AutomationControl::commit_transaction (bool 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 ()));
+       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 ();
        }
 }