Make Soundcloud upload applicable to any export format.

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

diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc
index d3138ee336e9202b1df54a9947765ada011e1f0c..5fa7285c674f11b585ac6beecf24259df72e9217 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"
@@ -28,8 +30,6 @@
 
 using namespace ARDOUR;
 using namespace PBD;
-using std::cerr;
-using std::endl;
 
 AutomationWatch* AutomationWatch::_instance = 0;
 
@@ -65,8 +65,8 @@ void
 AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac)
 {
        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);
+       DEBUG_TRACE (DEBUG::Automation, string_compose ("now watching control %1 for automation, astate = %2\n", ac->name(), enum_2_string (ac->automation_state())));
+       automation_watches.insert (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
@@ -74,8 +74,10 @@ 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, so enter write pass\n", _session->transport_speed()));
-               ac->list()->set_in_write_pass (true);
+               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());
        }
 
        /* we can't store shared_ptr<Destructible> in connections because it
@@ -104,7 +106,7 @@ AutomationWatch::remove_automation_watch (boost::shared_ptr<AutomationControl> a
 {
        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);
+       automation_watches.erase (ac);
        ac->list()->set_in_write_pass (false);
 }
 
@@ -117,12 +119,12 @@ 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());
+                               (*aw)->list()->add (time, (*aw)->user_double(), true);
                        }
                }
        }
@@ -134,7 +136,7 @@ void
 AutomationWatch::thread ()
 {
        while (_run_thread) {
-               usleep (100000); // Config->get_automation_interval() * 10);
+               Glib::usleep ((gulong) floor (Config->get_automation_interval_msecs() * 1000));
                timer ();
        }
 }