Fix another hardcoded "tar.xz" -> ARDOUR::session_archive_suffix

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

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 19678ec19c4a6cd94f8b9423cc6d76e4d7fe280d..26961f633ccf225a32a62a79084649cc1a4d0cd8 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -57,6 +57,7 @@ Automatable::Automatable(Session& session)
 
 Automatable::Automatable (const Automatable& other)
         : ControlSet (other)
+        , Slavable ()
         , _a_session (other._a_session)
 {
         Glib::Threads::Mutex::Lock lm (other._control_lock);
@@ -328,6 +329,8 @@ Automatable::protect_automation ()
                case Write:
                        l->set_automation_state (Off);
                        break;
+               case Latch:
+                       // no break
                case Touch:
                        l->set_automation_state (Play);
                        break;
@@ -338,8 +341,10 @@ Automatable::protect_automation ()
 }
 
 void
-Automatable::non_realtime_locate (framepos_t now)
+Automatable::non_realtime_locate (samplepos_t now)
 {
+       bool rolling = _a_session.transport_rolling ();
+
        for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
 
                boost::shared_ptr<AutomationControl> c
@@ -348,15 +353,41 @@ Automatable::non_realtime_locate (framepos_t now)
                        boost::shared_ptr<AutomationList> l
                                = boost::dynamic_pointer_cast<AutomationList>(c->list());
 
-                       if (l) {
-                               l->start_write_pass (now);
+                       if (!l) {
+                               continue;
+                       }
+
+                       bool am_touching = c->touching ();
+                       if (rolling && am_touching) {
+                       /* when locating while rolling, and writing automation,
+                        * start a new write pass.
+                        * compare to compare to non_realtime_transport_stop()
+                        */
+                               const bool list_did_write = !l->in_new_write_pass ();
+                               c->stop_touch (-1); // time is irrelevant
+                               l->stop_touch (-1);
+                               c->commit_transaction (list_did_write);
+                               l->write_pass_finished (now, Config->get_automation_thinning_factor ());
+
+                               if (l->automation_state () == Write) {
+                                       l->set_automation_state (Touch);
+                               }
+                               if (l->automation_playback ()) {
+                                       c->set_value_unchecked (c->list ()->eval (now));
+                               }
+                       }
+
+                       l->start_write_pass (now);
+
+                       if (rolling && am_touching) {
+                               c->start_touch (now);
                        }
                }
        }
 }
 
 void
-Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processors*/)
+Automatable::non_realtime_transport_stop (samplepos_t now, bool /*flush_processors*/)
 {
        for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
                boost::shared_ptr<AutomationControl> c =
@@ -379,7 +410,8 @@ Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processor
                */
                const bool list_did_write = !l->in_new_write_pass ();
 
-               l->stop_touch (true, now);
+               c->stop_touch (now);
+               l->stop_touch (now);
 
                c->commit_transaction (list_did_write);
 
@@ -396,7 +428,7 @@ Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processor
 }
 
 void
-Automatable::automation_run (framepos_t start, pframes_t nframes)
+Automatable::automation_run (samplepos_t start, pframes_t nframes)
 {
        for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
                boost::shared_ptr<AutomationControl> c =