auto-backup: gtk2_ardour part. (from mixbus)

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 1c4525470bb018e0db8d2ddc572e11673311f203..5755e04aacc7e04210acebd7c52eb8ad6ee93b4f 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -56,8 +56,9 @@ AutomationControl::AutomationControl(ARDOUR::Session&                          s
 
        : Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name, flags)
        , Evoral::Control(parameter, desc, list)
-       , _session(session)
+       , SessionHandleRef (session)
        , _desc(desc)
+       , _no_session(false)
 {
        if (_desc.toggled) {
                set_flags (Controllable::Toggle);
@@ -70,10 +71,18 @@ AutomationControl::AutomationControl(ARDOUR::Session&                          s
 
 AutomationControl::~AutomationControl ()
 {
-       if (!_session.deletion_in_progress ()) {
+       if (!_no_session && !_session.deletion_in_progress ()) {
                _session.selection().remove_control_by_id (id());
+               DropReferences (); /* EMIT SIGNAL */
        }
+}
+
+void
+AutomationControl::session_going_away ()
+{
+       SessionHandleRef::session_going_away ();
        DropReferences (); /* EMIT SIGNAL */
+       _no_session = true;
 }
 
 bool
@@ -90,8 +99,8 @@ AutomationControl::writable() const
 double
 AutomationControl::get_value() const
 {
-       bool from_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback();
-       return Control::get_double (from_list, _session.transport_frame());
+       bool from_list = alist() && alist()->automation_playback();
+       return Control::get_double (from_list, _session.transport_sample());
 }
 
 double
@@ -149,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;
@@ -176,8 +185,8 @@ AutomationControl::automation_run (framepos_t start, pframes_t nframes)
 void
 AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
 {
-       boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (_list);
-       const framepos_t pos = _session.transport_frame();
+       boost::shared_ptr<AutomationList> al = alist ();
+       const samplepos_t pos = _session.transport_sample();
        bool to_list;
 
        /* We cannot use ::get_value() here since that is virtual, and intended
@@ -232,7 +241,7 @@ AutomationControl::set_automation_state (AutoState as)
        if (flags() & NotAutomatable) {
                return;
        }
-       if (_list && as != alist()->automation_state()) {
+       if (alist() && as != alist()->automation_state()) {
 
                const double val = get_value ();
 
@@ -244,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()) {
@@ -274,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).
                 *
@@ -297,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());