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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index cfed48e223..26631d0fad 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -25,7 +25,6 @@
 #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"
@@ -33,10 +32,14 @@
 
 #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)
 {
@@ -47,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 ()
@@ -119,8 +124,26 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 	} else {
 		if (role() == Listen) {
 			/* We're going to the monitor bus, so discard MIDI data */
-			assert (mixbufs.available().get (DataType::AUDIO) >= bufs.count().get (DataType::AUDIO));
-			mixbufs.read_from (bufs, nframes, DataType::AUDIO);
+			
+			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);
@@ -153,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 */
@@ -254,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;
 	}
 
@@ -303,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;
 	}
@@ -336,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 ();
 	}
 }