For 'Route::send_pan_azi_controllable()' (when building non-Mixbus) I'm assuming...

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 7deeac422185e37c44684c5b680d917431d6aae6..5755e04aacc7e04210acebd7c52eb8ad6ee93b4f 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -100,7 +100,7 @@ double
 AutomationControl::get_value() const
 {
        bool from_list = alist() && alist()->automation_playback();
-       return Control::get_double (from_list, _session.transport_frame());
+       return Control::get_double (from_list, _session.transport_sample());
 }
 
 double
@@ -158,7 +158,7 @@ AutomationControl::grouped_controls () const
 }
 
 void
-AutomationControl::automation_run (framepos_t start, pframes_t nframes)
+AutomationControl::automation_run (samplepos_t start, pframes_t nframes)
 {
        if (!automation_playback ()) {
                return;
@@ -186,7 +186,7 @@ void
 AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
 {
        boost::shared_ptr<AutomationList> al = alist ();
-       const framepos_t pos = _session.transport_frame();
+       const samplepos_t pos = _session.transport_sample();
        bool to_list;
 
        /* We cannot use ::get_value() here since that is virtual, and intended
@@ -253,10 +253,10 @@ AutomationControl::set_automation_state (AutoState as)
 
                if (as == Write) {
                        AutomationWatch::instance().add_automation_watch (shared_from_this());
-               } else if (as == Touch) {
+               } else if (as & (Touch | Latch)) {
                        if (alist()->empty()) {
-                               Control::set_double (val, _session.current_start_frame (), true);
-                               Control::set_double (val, _session.current_end_frame (), true);
+                               Control::set_double (val, _session.current_start_sample (), true);
+                               Control::set_double (val, _session.current_end_sample (), true);
                                Changed (true, Controllable::NoGroup);
                        }
                        if (!touching()) {
@@ -283,7 +283,7 @@ AutomationControl::start_touch (double when)
                return;
        }
 
-       if (alist()->automation_state() == Touch) {
+       if (alist()->automation_state() & (Touch | Latch)) {
                /* subtle. aligns the user value with the playback and
                 * use take actual value (incl masters).
                 *
@@ -306,9 +306,13 @@ AutomationControl::stop_touch (double when)
                return;
        }
 
+       if (alist()->automation_state() == Latch && _session.transport_rolling ()) {
+               return;
+       }
+
        set_touching (false);
 
-       if (alist()->automation_state() == Touch) {
+       if (alist()->automation_state() & (Touch | Latch)) {
                alist()->stop_touch (when);
                if (!_desc.toggled) {
                        AutomationWatch::instance().remove_automation_watch (shared_from_this());