X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdelivery.cc;h=d95e32a02f4132869a717d3fadfc2623d9cec692;hb=b3ef0a9e8d4a5ed9042c0e61d5437ad99c664247;hp=ed1c89a3e262dbf9fab670c07343b49254f7de5a;hpb=17ace643e4edbec1e5bd7b446d039f8c94beef75;p=ardour.git

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index ed1c89a3e2..d95e32a02f 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -34,7 +34,7 @@
 #include "ardour/port.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR { class Panner; }
 
@@ -229,7 +229,7 @@ Delivery::configure_io (ChanCount in, ChanCount out)
 }
 
 void
-Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool result_required)
+Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double /*speed*/, pframes_t nframes, bool result_required)
 {
 	assert (_output);
 
@@ -297,27 +297,53 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
 
 		_panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes);
 
-		// MIDI data will not have been delivered by the panner
+		// non-audio data will not have been delivered by the panner
 
-		if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
-			_output->copy_to_outputs (bufs, DataType::MIDI, nframes, ports.port(0)->port_offset());
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			if (*t != DataType::AUDIO && bufs.count().get(*t) > 0) {
+				_output->copy_to_outputs (bufs, *t, nframes, Port::port_offset());
+			}
 		}
 
 	} else {
 
-		// Do a 1:1 copy of data to output ports
+		/* Do a 1:1 copy of data to output ports
+
+		   Audio is handled separately because we use 0 for the offset,
+		   since the port offset is only used for timestamped events
+		   (i.e. MIDI).
+		*/
 
-		if (bufs.count().n_audio() > 0 && ports.count().n_audio () > 0) {
+		if (bufs.count().n_audio() > 0) {
 			_output->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
 		}
 
-		if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
-			_output->copy_to_outputs (bufs, DataType::MIDI, nframes, ports.port(0)->port_offset());
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			if (*t != DataType::AUDIO && bufs.count().get(*t) > 0) {
+				_output->copy_to_outputs (bufs, *t, nframes, Port::port_offset());
+			}
 		}
 	}
 
 	if (result_required) {
-		bufs.read_from (output_buffers (), nframes);
+		/* "bufs" are internal, meaning they should never reflect
+		   split-cycle offsets. So shift events back in time from where
+		   they were for the external buffers associated with Ports.
+		*/
+
+		const BufferSet& outs (output_buffers());
+		bufs.set_count (output_buffers().count ());
+
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+
+			uint32_t n = 0;
+			for (BufferSet::iterator b = bufs.begin (*t); b != bufs.end (*t); ++b) {
+				if (outs.count ().get (*t) <= n) {
+					continue;
+				}
+				b->read_from (outs.get (*t, n++), nframes, (*t == DataType::AUDIO ? 0 : -Port::port_offset()));
+			}
+		}
 	}
 
 out:
@@ -491,7 +517,7 @@ Delivery::transport_stopped (framepos_t now)
 void
 Delivery::realtime_locate ()
 {
-        if (_output) {
+	if (_output) {
                 PortSet& ports (_output->ports());
 
                 for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {