X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=26631d0fadc031e9998fa274f492d11e1b09bae1;hb=0d7ee3fbd36ed735b17098adb5b35d1ab2927e52;hp=e873b73aac5d7b1574dc8f3ceedefcd2cb7a1eab;hpb=afdb298462cd7e6bb4ce866a1714a032c33be917;p=ardour.git

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index e873b73aac..26631d0fad 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -25,17 +25,21 @@
 #include "ardour/internal_return.h"
 #include "ardour/internal_send.h"
 #include "ardour/meter.h"
-#include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
+#include "ardour/audioengine.h"
 
 #include "i18n.h"
 
+namespace ARDOUR { class MuteMaster; class Pannable; }
+
 using namespace PBD;
 using namespace ARDOUR;
 using namespace std;
 
+PBD::Signal1<void, pframes_t> InternalSend::CycleStart;
+
 InternalSend::InternalSend (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, boost::shared_ptr<Route> sendto, Delivery::Role role)
 	: Send (s, p, mm, role)
 {
@@ -46,6 +50,8 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr<Pannable> p, boost::sh
         }
 
 	init_gain ();
+
+	CycleStart.connect_same_thread (*this, boost::bind (&InternalSend::cycle_start, this, _1));
 }
 
 InternalSend::~InternalSend ()
@@ -81,12 +87,7 @@ InternalSend::use_target (boost::shared_ptr<Route> sendto)
 	mixbufs.ensure_buffers (_send_to->internal_return()->input_streams(), _session.get_block_size());
 	mixbufs.set_count (_send_to->internal_return()->input_streams());
 
-	ChanCount n = _send_to->internal_return()->input_streams ();
-
-	if (n != _configured_output) {
-		_configured_output = n;
-		reset_panner ();
-	}
+	reset_panner ();
 
         set_name (sendto->name());
         _send_to_id = _send_to->id();
@@ -118,12 +119,35 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 	// we have to copy the input, because we may alter the buffers with the amp
 	// in-place, which a send must never do.
 
-	assert(mixbufs.available() >= bufs.count());
-
 	if (_panshell && !_panshell->bypassed()) {
 		_panshell->run (bufs, mixbufs, start_frame, end_frame, nframes);
 	} else {
-		mixbufs.read_from (bufs, nframes);
+		if (role() == Listen) {
+			/* We're going to the monitor bus, so discard MIDI data */
+			
+			uint32_t const bufs_audio = bufs.count().get (DataType::AUDIO);
+			uint32_t const mixbufs_audio = mixbufs.count().get (DataType::AUDIO);
+			
+			assert (mixbufs.available().get (DataType::AUDIO) >= bufs_audio);
+
+			/* Copy bufs into mixbufs, going round bufs more than once if necessary
+			   to ensure that every mixbuf gets some data.
+			*/
+
+			uint32_t j = 0;
+			for (uint32_t i = 0; i < mixbufs_audio; ++i) {
+				mixbufs.get_audio(i).read_from (bufs.get_audio(j), nframes);
+				++j;
+
+				if (j == bufs_audio) {
+					j = 0;
+				}
+			}
+
+		} else {
+			assert (mixbufs.available() >= bufs.count());
+			mixbufs.read_from (bufs, nframes);
+		}
 	}
 
 	/* gain control */
@@ -152,10 +176,8 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 		Amp::apply_simple_gain (mixbufs, nframes, tgain);
 	}
 
-	// Can't automate gain for sends or returns yet because we need different buffers
-	// so that we don't overwrite the main automation data for the route amp
-	// _amp->setup_gain_automation (start_frame, end_frame, nframes);
-
+	_amp->set_gain_automation_buffer (_session.send_gain_automation_buffer ());
+	_amp->setup_gain_automation (start_frame, end_frame, nframes);
 	_amp->run (mixbufs, start_frame, end_frame, nframes, true);
 
 	/* consider metering */
@@ -253,7 +275,8 @@ InternalSend::connect_when_legal ()
         boost::shared_ptr<Route> sendto;
 
 	if ((sendto = _session.route_by_id (_send_to_id)) == 0) {
-		error << X_("cannot find route to connect to") << endmsg;
+		error << string_compose (_("%1 - cannot find any track/bus with the ID %2 to connect to"), display_name(), _send_to_id) << endmsg;
+		cerr << string_compose (_("%1 - cannot find any track/bus with the ID %2 to connect to"), display_name(), _send_to_id) << endl;
 		return -1;
 	}
 
@@ -302,7 +325,7 @@ string
 InternalSend::display_name () const
 {
 	if (_role == Aux) {
-		return string_compose (X_("aux-%1"), _name);
+		return string_compose (X_("%1"), _name);
 	} else {
 		return _name;
 	}
@@ -335,11 +358,9 @@ InternalSend::set_can_pan (bool yn)
 }
 
 void
-InternalSend::cycle_start (pframes_t nframes)
+InternalSend::cycle_start (pframes_t /*nframes*/)
 {
-	Delivery::cycle_start (nframes);
-
 	for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) {
-		(*b).prepare ();
+		b->prepare ();
 	}
 }