X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_watch.cc;h=0445d05d8aebf2238893063658c7ca27771a0245;hb=88c82aeb56c62d9d0c0acff51e360492ad9b8d23;hp=c949509d091e88348cdf8bdb8801fec4e33214f3;hpb=6ab00534c0e8c372d759551e4f90a016918e71a9;p=ardour.git

diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc
index c949509d09..0445d05d8a 100644
--- a/libs/ardour/automation_watch.cc
+++ b/libs/ardour/automation_watch.cc
@@ -82,9 +82,9 @@ 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",
-								_session->transport_speed(), _session->audible_frame()));
+								_session->transport_speed(), _session->audible_sample()));
 		/* add a guard point since we are already moving */
-		ac->list()->set_in_write_pass (true, true, _session->audible_frame());
+		ac->list()->set_in_write_pass (true, true, _session->audible_sample());
 	}
 
 	/* we can't store shared_ptr<Destructible> in connections because it
@@ -119,7 +119,7 @@ AutomationWatch::remove_automation_watch (boost::shared_ptr<AutomationControl> a
 }
 
 void
-AutomationWatch::transport_stop_automation_watches (framepos_t when)
+AutomationWatch::transport_stop_automation_watches (samplepos_t when)
 {
 	DEBUG_TRACE (DEBUG::Automation, "clear all automation watches\n");
 
@@ -153,7 +153,7 @@ AutomationWatch::timer ()
 	{
 		Glib::Threads::Mutex::Lock lm (automation_watch_lock);
 
-		framepos_t time = _session->audible_frame ();
+		samplepos_t time = _session->audible_sample ();
 		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()) {
@@ -186,7 +186,7 @@ AutomationWatch::timer ()
 void
 AutomationWatch::thread ()
 {
-	pbd_set_thread_priority (pthread_self(), SCHED_FIFO, -25);
+	pbd_set_thread_priority (pthread_self(), PBD_SCHED_FIFO, -25);
 	while (_run_thread) {
 		Glib::usleep ((gulong) floor (Config->get_automation_interval_msecs() * 1000));
 		timer ();
@@ -223,7 +223,7 @@ AutomationWatch::transport_state_change ()
 
 	bool rolling = _session->transport_rolling();
 
-	_last_time = _session->audible_frame ();
+	_last_time = _session->audible_sample ();
 
 	{
 		Glib::Threads::Mutex::Lock lm (automation_watch_lock);