#include <iostream>
+#include <glibmm/timer.h>
+
#include "pbd/compose.h"
#include "ardour/automation_control.h"
using namespace ARDOUR;
using namespace PBD;
-using std::cerr;
-using std::endl;
AutomationWatch* AutomationWatch::_instance = 0;
_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);
- DEBUG_TRACE (DEBUG::Automation, string_compose ("now watching control %1 for automation\n", ac->name()));
- automation_watches.push_back (ac);
+ Glib::Threads::Mutex::Lock lm (automation_watch_lock);
+ 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
*/
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
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);
+ automation_watches.erase (ac);
ac->list()->set_in_write_pass (false);
}
}
{
- 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) {
AutomationWatch::thread ()
{
while (_run_thread) {
- usleep (100000); // Config->get_automation_interval() * 10);
+ Glib::usleep ((gulong) floor (Config->get_automation_interval_msecs() * 1000));
timer ();
}
}
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));
}
bool rolling = _session->transport_rolling();
{
- Glib::Mutex::Lock lm (automation_watch_lock);
+ 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",