NO-OP: consistent [internal] API name for Automatables

7 files changed, 13 insertions, 15 deletions

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 736992d3d0..ead74d311d 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -84,7 +84,7 @@ public:
 	void clear_controls ();
 
 	virtual void non_realtime_locate (framepos_t now);
-	virtual void transport_stopped (framepos_t now);
+	virtual void non_realtime_transport_stop (framepos_t now, bool flush);
 
 	virtual void automation_run (framepos_t, pframes_t);
 
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index 80b8431737..7084008949 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -77,7 +77,7 @@ public:
 
 	void flush_buffers (framecnt_t nframes);
 	void no_outs_cuz_we_no_monitor(bool);
-	void transport_stopped (framepos_t frame);
+	void non_realtime_transport_stop (framepos_t now, bool flush);
 	void realtime_locate ();
 
 	BufferSet& output_buffers() { return *_output_buffers; }
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index d5611c6fe9..f4f15ff4a9 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -134,7 +134,7 @@ public:
 
 	virtual bool can_record() { return false; }
 
-	virtual void nonrealtime_handle_transport_stopped (bool abort, bool did_locate, bool flush_processors);
+	virtual void non_realtime_transport_stop (framepos_t now, bool flush);
 	virtual void realtime_handle_transport_stopped () {}
 	virtual void realtime_locate () {}
 	virtual void non_realtime_locate (framepos_t);
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index aa0dd5edf7..19678ec19c 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -356,7 +356,7 @@ Automatable::non_realtime_locate (framepos_t now)
 }
 
 void
-Automatable::transport_stopped (framepos_t now)
+Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processors*/)
 {
 	for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
 		boost::shared_ptr<AutomationControl> c =
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 9e87c89346..a4cc7885d8 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -498,12 +498,12 @@ Delivery::flush_buffers (framecnt_t nframes)
 }
 
 void
-Delivery::transport_stopped (framepos_t now)
+Delivery::non_realtime_transport_stop (framepos_t now, bool flush)
 {
-        Processor::transport_stopped (now);
+	Processor::non_realtime_transport_stop (now, flush);
 
 	if (_panshell) {
-		_panshell->pannable()->transport_stopped (now);
+		_panshell->pannable()->non_realtime_transport_stop (now, flush);
 	}
 
         if (_output) {
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 1ef3badc2c..5fc1105f61 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -3300,22 +3300,20 @@ Route::feeds_according_to_graph (boost::shared_ptr<Route> other)
 
 /** Called from the (non-realtime) butler thread when the transport is stopped */
 void
-Route::nonrealtime_handle_transport_stopped (bool /*abort_ignored*/, bool /*did_locate*/, bool can_flush_processors)
+Route::non_realtime_transport_stop (framepos_t now, bool flush)
 {
-	framepos_t now = _session.transport_frame();
-
 	{
 		Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
-		Automatable::transport_stopped (now);
+		Automatable::non_realtime_transport_stop (now, flush);
 
 		for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
 
-			if (!_have_internal_generator && (Config->get_plugins_stop_with_transport() && can_flush_processors)) {
+			if (!_have_internal_generator && (Config->get_plugins_stop_with_transport() && flush)) {
 				(*i)->flush ();
 			}
 
-			(*i)->transport_stopped (now);
+			(*i)->non_realtime_transport_stop (now, flush);
 		}
 	}
 
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index af75e30b1f..1ff7aaf0b7 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -809,11 +809,11 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 		PostTransportWork ptw = post_transport_work ();
 
 		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-			(*i)->nonrealtime_handle_transport_stopped (abort, (ptw & PostTransportLocate), (!(ptw & PostTransportLocate) || pending_locate_flush));
+			(*i)->non_realtime_transport_stop (_transport_frame, !(ptw & PostTransportLocate) || pending_locate_flush);
 		}
 		VCAList v = _vca_manager->vcas ();
 		for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) {
-			(*i)->transport_stopped (_transport_frame);
+			(*i)->non_realtime_transport_stop (_transport_frame, !(ptw & PostTransportLocate) || pending_locate_flush);
 		}
 
 		update_latency_compensation ();