a-EQ: Tweak knob layout to be less confusing

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index a377aed839aa2b94172f8939faca3d1b270b5bef..4e81de8aaffb067d917d07fb2b434aeb6d9c4f1b 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -30,6 +30,8 @@
 #include "ardour/control_group.h"
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
+#include "ardour/selection.h"
+#include "ardour/value_as_string.h"
 
 #include "pbd/i18n.h"
 
@@ -60,10 +62,15 @@ AutomationControl::AutomationControl(ARDOUR::Session&                          s
        if (_desc.toggled) {
                set_flags (Controllable::Toggle);
        }
+       boost::shared_ptr<AutomationList> al = alist();
+       if (al) {
+               al->StateChanged.connect_same_thread (_state_changed_connection, boost::bind (&Session::set_dirty, &_session));
+       }
 }
 
 AutomationControl::~AutomationControl ()
 {
+       _session.selection().remove_control_by_id (id());
        DropReferences (); /* EMIT SIGNAL */
 }
 
@@ -85,6 +92,16 @@ AutomationControl::get_value() const
        return Control::get_double (from_list, _session.transport_frame());
 }
 
+void
+AutomationControl::pre_realtime_queue_stuff (double val, PBD::Controllable::GroupControlDisposition gcd)
+{
+       if (_group && _group->use_me (gcd)) {
+               _group->pre_realtime_queue_stuff (val);
+       } else {
+               do_pre_realtime_queue_stuff (val);
+       }
+}
+
 void
 AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposition gcd)
 {
@@ -150,19 +167,25 @@ AutomationControl::actually_set_value (double value, PBD::Controllable::GroupCon
                } else if (al->automation_playback()) {
                        to_list = false;
                        old_value = al->eval (pos);
+               } else {
+                       to_list = false;
+                       old_value = Control::user_double ();
                }
        }
 
        Control::set_double (value, pos, to_list);
 
        if (old_value != value) {
-               // AutomationType at = (AutomationType) _parameter.type();
-               // std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value
-               // << " (was " << old_value << ") @ " << this << std::endl;
+               //AutomationType at = (AutomationType) _parameter.type();
+               //std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value
+               //<< " (was " << old_value << ") @ " << this << std::endl;
 
                Changed (true, gcd);
-               _session.set_dirty ();
+               if (!al || !al->automation_playback ()) {
+                       _session.set_dirty ();
+               }
        }
+
 }
 
 void
@@ -184,6 +207,7 @@ AutomationControl::set_automation_state (AutoState as)
 
                alist()->set_automation_state (as);
                if (_desc.toggled) {
+                       Changed (false, Controllable::NoGroup); // notify slaves, update boolean masters
                        return;  // No watch for boolean automation
                }
 
@@ -316,6 +340,12 @@ AutomationControl::interface_to_internal (double val) const
        return val;
 }
 
+std::string
+AutomationControl::get_user_string () const
+{
+       return ARDOUR::value_as_string (_desc, get_value());
+}
+
 void
 AutomationControl::set_group (boost::shared_ptr<ControlGroup> cg)
 {