nick m's fix for markers etc ; several tweaks for mute/solo ; rename run_in_place() as run()

git-svn-id: svn://localhost/ardour2/branches/3.0@5155 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 2 deletions

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 4d79aad2b9..0a49a47a7f 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -142,18 +142,22 @@ Delivery::configure_io (ChanCount in, ChanCount out)
 }
 
 void
-Delivery::run_in_place (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+Delivery::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
 {
 	if (_output->n_ports ().get (_output->default_type()) == 0) {
 		return;
 	}
 
+	/* this setup is not just for our purposes, but for anything that comes after us in the 
+	   processing pathway that wants to use this->output_buffers() for some reason.
+	*/
+
 	PortSet& ports (_output->ports());
 	output_buffers().attach_buffers (ports, nframes, _output_offset);
 
 	// this Delivery processor is not a derived type, and thus we assume
 	// we really can modify the buffers passed in (it is almost certainly
-	// the main output stage of a Route). Contrast with Send::run_in_place()
+	// the main output stage of a Route). Contrast with Send::run()
 	// which cannot do this.
 
 	gain_t tgain = target_gain ();