X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Finternal_send.cc;h=7fe52ec617b6cee4a4b3ea5bed8cc367259c4be1;hb=c99738d88e8a2ad806b219b9f3614a6b55b6bf37;hp=36621717404cd62c720fb776f1f3e91706e6448f;hpb=2726184f42652a84816096887948658177ea24f8;p=ardour.git

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 3662171740..7fe52ec617 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -21,8 +21,12 @@
 #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"
 
@@ -32,32 +36,51 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace std;
 
-InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, boost::shared_ptr<Route> sendto, Delivery::Role role)
-	: Send (s, mm, role)
+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)
 {
         if (sendto) {
                 if (use_target (sendto)) {
                         throw failed_constructor();
                 }
         }
+
+	init_gain ();
 }
 
 InternalSend::~InternalSend ()
 {
 	if (_send_to) {
-		_send_to->release_return_buffer ();
+		_send_to->remove_send_from_internal_return (this);
+	}
+}
+
+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;
 
-        if ((target = _send_to->get_return_buffer ()) == 0) {
-                return -1;
-        }
-        
+        _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());
+
         set_name (sendto->name());
         _send_to_id = _send_to->id();
 
@@ -69,20 +92,18 @@ InternalSend::use_target (boost::shared_ptr<Route> sendto)
         return 0;
 }
 
-
 void
 InternalSend::send_to_going_away ()
 {
-	target = 0;
         target_connections.drop_connections ();
 	_send_to.reset ();
 	_send_to_id = "0";
 }
 
 void
-InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
+InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
 {
-	if ((!_active && !_pending_active) || !target || !_send_to) {
+	if ((!_active && !_pending_active) || !_send_to) {
 		_meter->reset ();
 		return;
 	}
@@ -91,7 +112,12 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 	// 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 {
+		mixbufs.read_from (bufs, nframes);
+	}
 
 	/* gain control */
 
@@ -103,7 +129,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_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.
@@ -125,8 +151,6 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 
 	_amp->run (mixbufs, start_frame, end_frame, nframes, true);
 
-	/* XXX NEED TO PAN */
-
 	/* consider metering */
 
 	if (_metering) {
@@ -137,18 +161,20 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 		}
 	}
 
-	/* deliver to target */
-
-	target->merge_from (mixbufs, nframes);
+	/* target will pick up our output when it is ready */
 
   out:
 	_active = _pending_active;
 }
 
-void
-InternalSend::set_block_size (nframes_t nframes)
+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;
 }
 
 bool
@@ -180,10 +206,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();
@@ -203,13 +233,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 ()
 {
@@ -279,3 +302,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 ();
+	}
+}