X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=4ddd0647042ba433f1f3273105c2f0d02d5c5a30;hb=dd577004459b7810daae2b4ad6741e3a2b858565;hp=210835d17607f427c89326d902352160203e7ae2;hpb=65a90ccffc81e5807479b50473cdfc85d4ec574c;p=ardour.git

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 210835d176..4ddd064704 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -21,10 +21,15 @@
 #include "pbd/failed_constructor.h"
 
 #include "ardour/amp.h"
+#include "ardour/audio_buffer.h"
+#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"
 
@@ -41,7 +46,7 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr<Pannable> p, boost::sh
                 }
         }
 
-	_amp->set_gain (0, this);
+	init_gain ();
 }
 
 InternalSend::~InternalSend ()
@@ -51,17 +56,34 @@ InternalSend::~InternalSend ()
 	}
 }
 
+void
+InternalSend::init_gain ()
+{
+	if (_role == Listen) {
+		/* send to monitor bus is always at unity */
+		_amp->set_gain (1.0, this);
+	} else {
+		/* aux sends start at -inf dB */
+		_amp->set_gain (0, this);
+	}
+}
+
 int
 InternalSend::use_target (boost::shared_ptr<Route> sendto)
 {
 	if (_send_to) {
 		_send_to->remove_send_from_internal_return (this);
 	}
-	
+
         _send_to = sendto;
 
         _send_to->add_send_to_internal_return (this);
-        
+
+	mixbufs.ensure_buffers (_send_to->internal_return()->input_streams(), _session.get_block_size());
+	mixbufs.set_count (_send_to->internal_return()->input_streams());
+
+	reset_panner ();
+
         set_name (sendto->name());
         _send_to_id = _send_to->id();
 
@@ -73,7 +95,6 @@ InternalSend::use_target (boost::shared_ptr<Route> sendto)
         return 0;
 }
 
-
 void
 InternalSend::send_to_going_away ()
 {
@@ -93,8 +114,36 @@ 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());
-	mixbufs.read_from (bufs, nframes);
+	if (_panshell && !_panshell->bypassed()) {
+		_panshell->run (bufs, mixbufs, start_frame, end_frame, nframes);
+	} else {
+		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 */
 
@@ -106,7 +155,7 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 
 		Amp::apply_gain (mixbufs, nframes, _current_gain, tgain);
 		_current_gain = tgain;
-                
+
 	} else if (tgain == 0.0) {
 
 		/* we were quiet last time, and we're still supposed to be quiet.
@@ -128,8 +177,6 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 
 	_amp->run (mixbufs, start_frame, end_frame, nframes, true);
 
-	/* XXX NEED TO PAN */
-
 	/* consider metering */
 
 	if (_metering) {
@@ -149,7 +196,10 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 int
 InternalSend::set_block_size (pframes_t nframes)
 {
-	mixbufs.ensure_buffers (_configured_input, nframes);
+	if (_send_to) {
+		mixbufs.ensure_buffers (_send_to->internal_return()->input_streams(), nframes);
+	}
+
         return 0;
 }
 
@@ -182,10 +232,14 @@ InternalSend::get_state()
 }
 
 int
-InternalSend::set_our_state (const XMLNode& node, int /*version*/)
+InternalSend::set_state (const XMLNode& node, int version)
 {
 	const XMLProperty* prop;
 
+	init_gain ();
+
+	Send::set_state (node, version);
+
 	if ((prop = node.property ("target")) != 0) {
 
 		_send_to_id = prop->value();
@@ -205,13 +259,6 @@ InternalSend::set_our_state (const XMLNode& node, int /*version*/)
 	return 0;
 }
 
-int
-InternalSend::set_state (const XMLNode& node, int version)
-{
-	Send::set_state (node, version);
-	return set_our_state (node, version);
-}
-
 int
 InternalSend::connect_when_legal ()
 {
@@ -239,6 +286,22 @@ InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 	return true;
 }
 
+uint32_t
+InternalSend::pan_outs () const
+{
+	/* the number of targets for our panner is determined by what we are
+	   sending to, if anything.
+	*/
+
+	if (_send_to) {
+		return _send_to->internal_return()->input_streams().n_audio();
+	}
+
+	return 1; /* zero is more accurate, but 1 is probably safer as a way to
+		   * say "don't pan"
+		   */
+}
+
 bool
 InternalSend::configure_io (ChanCount in, ChanCount out)
 {
@@ -281,3 +344,21 @@ InternalSend::send_to_property_changed (const PropertyChange& what_changed)
 		set_name (_send_to->name ());
 	}
 }
+
+void
+InternalSend::set_can_pan (bool yn)
+{
+	if (_panshell) {
+		_panshell->set_bypassed (!yn);
+	}
+}
+
+void
+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 ();
+	}
+}