X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=2ad08736dfa1d0c26035a70029442e5bf8b64f2c;hb=91ab5e31751105d59386aab6a6e16ac5582904dc;hp=87aadf4193ce339b8f5749829111b8f29785b59f;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 87aadf4193..2ad08736df 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -21,11 +21,12 @@
 #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"
 #include "ardour/io.h"
 #include "ardour/meter.h"
 #include "ardour/panner_shell.h"
@@ -48,7 +49,7 @@ string
 Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_bitslot)
 {
 	if (ignore_bitslot) {
-		/* this happens during initial construction of sends from XML, 
+		/* this happens during initial construction of sends from XML,
 		   before they get ::set_state() called. lets not worry about
 		   it.
 		*/
@@ -65,10 +66,10 @@ Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_b
 		return string_compose (_("send %1"), (bitslot = s.next_send_id ()) + 1);
 	default:
 		fatal << string_compose (_("programming error: send created using role %1"), enum_2_string (r)) << endmsg;
-		/*NOTREACHED*/
+		abort(); /*NOTREACHED*/
 		return string();
 	}
-	
+
 }
 
 Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, Role r, bool ignore_bitslot)
@@ -76,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
@@ -86,16 +88,21 @@ Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMas
 
 	//boost_debug_shared_ptr_mark_interesting (this, "send");
 
-	_amp.reset (new Amp (_session));
+	boost::shared_ptr<AutomationList> gl (new AutomationList (Evoral::Parameter (GainAutomation)));
+	_gain_control = boost::shared_ptr<GainControl> (new GainControl (_session, Evoral::Parameter(GainAutomation), gl));
+	add_control (_gain_control);
+
+	_amp.reset (new Amp (_session, _("Fader"), _gain_control, true));
 	_meter.reset (new PeakMeter (_session, name()));
 
 	_delayline.reset (new DelayLine (_session, name()));
 
-	add_control (_amp->gain_control ());
-
 	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 ()
@@ -152,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, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool)
 {
 	if (_output->n_ports() == ChanCount::ZERO) {
 		_meter->reset ();
@@ -178,13 +185,13 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe
 
 	_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->run (sendbufs, start_frame, end_frame, speed, nframes, true);
 
-	_delayline->run (sendbufs, start_frame, end_frame, nframes, true);
+	_delayline->run (sendbufs, start_frame, end_frame, speed, nframes, true);
 
 	/* deliver to outputs */
 
-	Delivery::run (sendbufs, start_frame, end_frame, nframes, true);
+	Delivery::run (sendbufs, start_frame, end_frame, speed, nframes, true);
 
 	/* consider metering */
 
@@ -192,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_frame, end_frame, speed, nframes, true);
 		}
 	}
 
@@ -218,6 +225,8 @@ Send::state (bool full)
 		node.add_property ("bitslot", buf);
 	}
 
+	node.add_property("selfdestruct", _remove_on_disconnect ? "yes" : "no");
+
 	node.add_child_nocopy (_amp->state (full));
 
 	return node;
@@ -230,7 +239,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);
 
@@ -239,7 +248,7 @@ Send::set_state (const XMLNode& node, int version)
 		/* don't try to reset bitslot if there is a node for it already: this can cause
 		   issues with the session's accounting of send ID's
 		*/
-		
+
 		if ((prop = node.property ("bitslot")) == 0) {
 			if (_role == Delivery::Aux) {
 				_bitslot = _session.next_aux_send_id ();
@@ -264,7 +273,11 @@ Send::set_state (const XMLNode& node, int version)
 			}
 		}
 	}
-	
+
+	if ((prop = node.property (X_("selfdestruct"))) != 0) {
+		_remove_on_disconnect = string_is_affirmative (prop->value());
+	}
+
 	XMLNodeList nlist = node.children();
 	for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) {
 		if ((*i)->name() == X_("Processor")) {
@@ -396,9 +409,18 @@ Send::display_to_user () const
 }
 
 string
-Send::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+Send::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
 	return _amp->value_as_string (ac);
 }
 
-	
+void
+Send::snd_output_changed (IOChange change, void* /*src*/)
+{
+	if (change.type & IOChange::ConnectionsChanged) {
+		if (!_output->connected() && _remove_on_disconnect) {
+			_remove_on_disconnect = false;
+			SelfDestruct (); /* EMIT SIGNAL */
+		}
+	}
+}