X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_watch.cc;h=4152c5d5b7602a5beeec90d40bfe3c34dd384b33;hb=d01cb7910faddbf13b7190ceca990a2cafb71f95;hp=b300680f8781e1e750ab149f9faa7ba33381e1f4;hpb=4a7236b773d691fd3c1647fab8f54b2f56b8bbb2;p=ardour.git

diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc
index b300680f87..4152c5d5b7 100644
--- a/libs/ardour/automation_watch.cc
+++ b/libs/ardour/automation_watch.cc
@@ -47,7 +47,7 @@ AutomationWatch::AutomationWatch ()
 	, _last_time (0)
 	, _run_thread (false)
 {
-	
+
 }
 
 AutomationWatch::~AutomationWatch ()
@@ -75,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());
@@ -85,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));
 }
@@ -128,18 +128,18 @@ AutomationWatch::timer ()
 					(*aw)->list()->add (time, (*aw)->user_double(), true);
 				}
 			}
-		} else {  //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)
+		} 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(), rolling,
+				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);
+					(*aw)->list()->set_in_write_pass (true, time);
 				}
 			}
 		}
-		
+
 		_last_time = time;
 	}
 
@@ -171,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));
 	}
 }
@@ -184,14 +184,14 @@ 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()) {