fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc
index 16e10c95f941f938340488419fae9f3c88545dc3..4152c5d5b7602a5beeec90d40bfe3c34dd384b33 100644 (file)
--- a/libs/ardour/automation_watch.cc
+++ b/libs/ardour/automation_watch.cc
@@ -19,6 +19,8 @@
 
 #include <iostream>
 
+#include <glibmm/timer.h>
+
 #include "pbd/compose.h"
 
 #include "ardour/automation_control.h"
@@ -42,9 +44,10 @@ AutomationWatch::instance ()
 
 AutomationWatch::AutomationWatch ()
        : _thread (0)
+       , _last_time (0)
        , _run_thread (false)
 {
-       
+
 }
 
 AutomationWatch::~AutomationWatch ()
@@ -72,7 +75,7 @@ AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac)
         */
 
        if (_session && _session->transport_rolling() && ac->alist()->automation_write()) {
-               DEBUG_TRACE (DEBUG::Automation, string_compose ("\ttransport is rolling @ %1, audible = %2so enter write pass\n", 
+               DEBUG_TRACE (DEBUG::Automation, string_compose ("\ttransport is rolling @ %1, audible = %2so enter write pass\n",
                                                                _session->transport_speed(), _session->audible_frame()));
                /* add a guard point since we are already moving */
                ac->list()->set_in_write_pass (true, true, _session->audible_frame());
@@ -82,7 +85,7 @@ AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac)
         * creates reference cycles. we don't need to make the weak_ptr<>
         * explicit here, but it helps to remind us what is going on.
         */
-       
+
        boost::weak_ptr<AutomationControl> wac (ac);
        ac->DropReferences.connect_same_thread (*this, boost::bind (&AutomationWatch::remove_weak_automation_watch, this, wac));
 }
@@ -119,12 +122,25 @@ AutomationWatch::timer ()
                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) {
-                       if ((*aw)->alist()->automation_write()) {
-                               (*aw)->list()->add (time, (*aw)->user_double());
+               if (time > _last_time) {  //we only write automation in the forward direction; this fixes automation-recording in a loop
+                       for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
+                               if ((*aw)->alist()->automation_write()) {
+                                       (*aw)->list()->add (time, (*aw)->user_double(), true);
+                               }
+                       }
+               } else if (time != _last_time) {  //transport stopped or reversed.  stop the automation pass and start a new one (for bonus points, someday store the previous pass in an undo record)
+                       for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
+                               DEBUG_TRACE (DEBUG::Automation, string_compose ("%1: transport in rewind, speed %2, in write pass ? %3 writing ? %4\n",
+                                                                               (*aw)->name(), _session->transport_speed(), _session->transport_rolling(),
+                                                                               (*aw)->alist()->automation_write()));
+                               (*aw)->list()->set_in_write_pass (false);
+                               if ( (*aw)->alist()->automation_write() ) {
+                                       (*aw)->list()->set_in_write_pass (true, time);
+                               }
                        }
                }
+
+               _last_time = time;
        }
 
        return TRUE;
@@ -134,7 +150,7 @@ void
 AutomationWatch::thread ()
 {
        while (_run_thread) {
-               usleep ((useconds_t) floor (Config->get_automation_interval_msecs() * 1000));
+               Glib::usleep ((gulong) floor (Config->get_automation_interval_msecs() * 1000));
                timer ();
        }
 }
@@ -155,7 +171,7 @@ AutomationWatch::set_session (Session* s)
        if (_session) {
                _run_thread = true;
                _thread = Glib::Threads::Thread::create (boost::bind (&AutomationWatch::thread, this));
-               
+
                _session->TransportStateChange.connect_same_thread (transport_connection, boost::bind (&AutomationWatch::transport_state_change, this));
        }
 }
@@ -169,11 +185,13 @@ AutomationWatch::transport_state_change ()
 
        bool rolling = _session->transport_rolling();
 
+       _last_time = _session->audible_frame ();
+
        {
                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", 
+                       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()) {