put automation list into or out of Touch mode before adding an automation watch,...

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

diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc
index 670636e9777ed7c8debdbd3be9ec619f573d7bdf..d3138ee336e9202b1df54a9947765ada011e1f0c 100644 (file)
--- a/libs/ardour/automation_watch.cc
+++ b/libs/ardour/automation_watch.cc
@@ -57,17 +57,27 @@ AutomationWatch::~AutomationWatch ()
                _thread = 0;
        }
 
-       Glib::Mutex::Lock lm (automation_watch_lock);
+       Glib::Threads::Mutex::Lock lm (automation_watch_lock);
        automation_watches.clear ();
 }
 
 void
 AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac)
 {
-       Glib::Mutex::Lock lm (automation_watch_lock);
+       Glib::Threads::Mutex::Lock lm (automation_watch_lock);
        DEBUG_TRACE (DEBUG::Automation, string_compose ("now watching control %1 for automation\n", ac->name()));
        automation_watches.push_back (ac);
 
+       /* if an automation control is added here while the transport is
+        * rolling, make sure that it knows that there is a write pass going
+        * on, rather than waiting for the transport to start.
+        */
+
+       if (_session && _session->transport_rolling() && ac->alist()->automation_write()) {
+               DEBUG_TRACE (DEBUG::Automation, string_compose ("\ttransport is rolling @ %1, so enter write pass\n", _session->transport_speed()));
+               ac->list()->set_in_write_pass (true);
+       }
+
        /* we can't store shared_ptr<Destructible> in connections because it
         * creates reference cycles. we don't need to make the weak_ptr<>
         * explicit here, but it helps to remind us what is going on.
@@ -92,9 +102,10 @@ AutomationWatch::remove_weak_automation_watch (boost::weak_ptr<AutomationControl
 void
 AutomationWatch::remove_automation_watch (boost::shared_ptr<AutomationControl> ac)
 {
-       Glib::Mutex::Lock lm (automation_watch_lock);
+       Glib::Threads::Mutex::Lock lm (automation_watch_lock);
        DEBUG_TRACE (DEBUG::Automation, string_compose ("remove control %1 from automation watch\n", ac->name()));
        automation_watches.remove (ac);
+       ac->list()->set_in_write_pass (false);
 }
 
 gint
@@ -105,12 +116,14 @@ AutomationWatch::timer ()
        }
 
        {
-               Glib::Mutex::Lock lm (automation_watch_lock);
+               Glib::Threads::Mutex::Lock lm (automation_watch_lock);
                
                framepos_t time = _session->audible_frame ();
 
                for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
-                       (*aw)->list()->add (time, (*aw)->user_double(), true);
+                       if ((*aw)->alist()->automation_write()) {
+                               (*aw)->list()->add (time, (*aw)->user_double());
+                       }
                }
        }
 
@@ -129,6 +142,8 @@ AutomationWatch::thread ()
 void
 AutomationWatch::set_session (Session* s)
 {
+       transport_connection.disconnect ();
+
        if (_thread) {
                _run_thread = false;
                _thread->join ();
@@ -139,8 +154,33 @@ AutomationWatch::set_session (Session* s)
 
        if (_session) {
                _run_thread = true;
-               _thread = Glib::Thread::create (boost::bind (&AutomationWatch::thread, this),
-                                               500000, true, true, Glib::THREAD_PRIORITY_NORMAL);
+               _thread = Glib::Threads::Thread::create (boost::bind (&AutomationWatch::thread, this));
                
+               _session->TransportStateChange.connect_same_thread (transport_connection, boost::bind (&AutomationWatch::transport_state_change, this));
+       }
+}
+
+void
+AutomationWatch::transport_state_change ()
+{
+       if (!_session) {
+               return;
+       }
+
+       bool rolling = _session->transport_rolling();
+
+       {
+               Glib::Threads::Mutex::Lock lm (automation_watch_lock);
+
+               for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
+                       DEBUG_TRACE (DEBUG::Automation, string_compose ("%1: transport state changed, speed %2, in write pass ? %3 writing ? %4\n", 
+                                                                       (*aw)->name(), _session->transport_speed(), rolling,
+                                                                       (*aw)->alist()->automation_write()));
+                       if (rolling && (*aw)->alist()->automation_write()) {
+                               (*aw)->list()->set_in_write_pass (true);
+                       } else {
+                               (*aw)->list()->set_in_write_pass (false);
+                       }
+               }
        }
 }