X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=c5ad4d8ed7a2dbd3b9898e0ef86a8636cc1fd4e3;hb=4e5423b3487771220cdca4c2b1a79c4d74b6afa5;hp=23ae860f47123fc7f1893d82e83d94cdc096c04d;hpb=55094b723774086d0f54d688b1ca73a4df82b93e;p=ardour.git

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 23ae860f47..c5ad4d8ed7 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -21,9 +21,9 @@
 #include <algorithm>
 
 #include "pbd/xml++.h"
-#include "pbd/boost_debug.h"
 
 #include "ardour/amp.h"
+#include "ardour/boost_debug.h"
 #include "ardour/buffer_set.h"
 #include "ardour/debug.h"
 #include "ardour/gain_control.h"
@@ -33,7 +33,7 @@
 #include "ardour/send.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 class AutomationControl;
@@ -77,6 +77,7 @@ Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMas
 	, _metering (false)
 	, _delay_in (0)
 	, _delay_out (0)
+	, _remove_on_disconnect (false)
 {
 	if (_role == Listen) {
 		/* we don't need to do this but it keeps things looking clean
@@ -99,6 +100,9 @@ Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMas
 	if (panner_shell()) {
 		panner_shell()->Changed.connect_same_thread (*this, boost::bind (&Send::panshell_changed, this));
 	}
+	if (_output) {
+		_output->changed.connect_same_thread (*this, boost::bind (&Send::snd_output_changed, this, _1, _2));
+	}
 }
 
 Send::~Send ()
@@ -126,7 +130,7 @@ Send::deactivate ()
 }
 
 void
-Send::set_delay_in(framecnt_t delay)
+Send::set_delay_in(samplecnt_t delay)
 {
 	if (!_delayline) return;
 	if (_delay_in == delay) {
@@ -141,7 +145,7 @@ Send::set_delay_in(framecnt_t delay)
 }
 
 void
-Send::set_delay_out(framecnt_t delay)
+Send::set_delay_out(samplecnt_t delay)
 {
 	if (!_delayline) return;
 	if (_delay_out == delay) {
@@ -155,7 +159,7 @@ Send::set_delay_out(framecnt_t delay)
 }
 
 void
-Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
+Send::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool)
 {
 	if (_output->n_ports() == ChanCount::ZERO) {
 		_meter->reset ();
@@ -180,14 +184,14 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe
 	/* gain control */
 
 	_amp->set_gain_automation_buffer (_session.send_gain_automation_buffer ());
-	_amp->setup_gain_automation (start_frame, end_frame, nframes);
-	_amp->run (sendbufs, start_frame, end_frame, nframes, true);
+	_amp->setup_gain_automation (start_sample, end_sample, nframes);
+	_amp->run (sendbufs, start_sample, end_sample, speed, nframes, true);
 
-	_delayline->run (sendbufs, start_frame, end_frame, nframes, true);
+	_delayline->run (sendbufs, start_sample, end_sample, speed, nframes, true);
 
 	/* deliver to outputs */
 
-	Delivery::run (sendbufs, start_frame, end_frame, nframes, true);
+	Delivery::run (sendbufs, start_sample, end_sample, speed, nframes, true);
 
 	/* consider metering */
 
@@ -195,7 +199,7 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe
 		if (_amp->gain_control()->get_value() == 0) {
 			_meter->reset();
 		} else {
-			_meter->run (*_output_buffers, start_frame, end_frame, nframes, true);
+			_meter->run (*_output_buffers, start_sample, end_sample, speed, nframes, true);
 		}
 	}
 
@@ -212,15 +216,15 @@ XMLNode&
 Send::state (bool full)
 {
 	XMLNode& node = Delivery::state(full);
-	char buf[32];
 
-	node.add_property ("type", "send");
-	snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot);
+	node.set_property ("type", "send");
 
 	if (_role != Listen) {
-		node.add_property ("bitslot", buf);
+		node.set_property ("bitslot", _bitslot);
 	}
 
+	node.set_property ("selfdestruct", _remove_on_disconnect);
+
 	node.add_child_nocopy (_amp->state (full));
 
 	return node;
@@ -233,7 +237,7 @@ Send::set_state (const XMLNode& node, int version)
 		return set_state_2X (node, version);
 	}
 
-	const XMLProperty* prop;
+	XMLProperty const * prop;
 
 	Delivery::set_state (node, version);
 
@@ -255,11 +259,11 @@ Send::set_state (const XMLNode& node, int version)
 		} else {
 			if (_role == Delivery::Aux) {
 				_session.unmark_aux_send_id (_bitslot);
-				sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+				_bitslot = string_to<uint32_t>(prop->value());
 				_session.mark_aux_send_id (_bitslot);
 			} else if (_role == Delivery::Send) {
 				_session.unmark_send_id (_bitslot);
-				sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+				_bitslot = string_to<uint32_t>(prop->value());
 				_session.mark_send_id (_bitslot);
 			} else {
 				// bitslot doesn't matter but make it zero anyway
@@ -268,6 +272,8 @@ Send::set_state (const XMLNode& node, int version)
 		}
 	}
 
+	node.get_property (X_("selfdestruct"), _remove_on_disconnect);
+
 	XMLNodeList nlist = node.children();
 	for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) {
 		if ((*i)->name() == X_("Processor")) {
@@ -340,7 +346,7 @@ Send::configure_io (ChanCount in, ChanCount out)
 		return false;
 	}
 
-	if (_delayline && !_delayline->configure_io(in, out)) {
+	if (_delayline && !_delayline->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs()))) {
 		cerr << "send delayline config failed\n";
 		return false;
 	}
@@ -398,8 +404,13 @@ Send::display_to_user () const
 	return true;
 }
 
-string
-Send::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+void
+Send::snd_output_changed (IOChange change, void* /*src*/)
 {
-	return _amp->value_as_string (ac);
+	if (change.type & IOChange::ConnectionsChanged) {
+		if (!_output->connected() && _remove_on_disconnect) {
+			_remove_on_disconnect = false;
+			SelfDestruct (); /* EMIT SIGNAL */
+		}
+	}
 }