X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=f299995ffaef2af29f0d40ad966e7c5dbfc5a0a8;hb=a107b95307658af9f881e453362c1388ffac2463;hp=89a66afa465a5fd15fb4c1999a19160fc16d9517;hpb=2085cddab3b1c8155b63c3c48304fffaa72c4e6c;p=ardour.git

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 89a66afa46..f299995ffa 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -21,6 +21,7 @@
 #include <algorithm>
 
 #include "pbd/xml++.h"
+#include "pbd/boost_debug.h"
 
 #include "ardour/amp.h"
 #include "ardour/send.h"
@@ -38,32 +39,19 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
 
-Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, Role r)
-	: Delivery (s, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r)
+Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, Role r)
+	: Delivery (s, p, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r)
 	, _metering (false)
 {
-	_amp.reset (new Amp (_session, _mute_master));
-	_meter.reset (new PeakMeter (_session));
-
-	ProcessorCreated (this); /* EMIT SIGNAL */
-}
+	boost_debug_shared_ptr_mark_interesting (this, "send");
 
-Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node, int version, Role r)
-        : Delivery (s, mm, "send", r)
-	, _metering (false)
-{
-	_amp.reset (new Amp (_session, _mute_master));
+	_amp.reset (new Amp (_session));
 	_meter.reset (new PeakMeter (_session));
-
-	if (set_state (node, version)) {
-		throw failed_constructor();
-	}
-
-	ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Send::~Send ()
 {
+        _session.unmark_send_id (_bitslot);
 }
 
 void
@@ -81,12 +69,12 @@ Send::deactivate ()
 	_amp->deactivate ();
 	_meter->deactivate ();
 	_meter->reset ();
-	
+
 	Processor::deactivate ();
 }
 
 void
-Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
+Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
 {
 	if (_output->n_ports() == ChanCount::ZERO) {
 		_meter->reset ();
@@ -139,7 +127,7 @@ Send::get_state(void)
 }
 
 XMLNode&
-Send::state(bool full)
+Send::state (bool full)
 {
 	XMLNode& node = Delivery::state(full);
 	char buf[32];
@@ -148,29 +136,75 @@ Send::state(bool full)
 	snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot);
 	node.add_property ("bitslot", buf);
 
+	node.add_child_nocopy (_amp->state (full));
+
 	return node;
 }
 
 int
 Send::set_state (const XMLNode& node, int version)
 {
-	XMLNodeList nlist = node.children();
-	XMLNodeIterator niter;
+	if (version < 3000) {
+		return set_state_2X (node, version);
+	}
+
 	const XMLProperty* prop;
 
-	if ((prop = node.property ("bitslot")) == 0) {
-		_bitslot = _session.next_send_id();
-	} else {
-		sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-		cerr << this << " scanned " << prop->value() << " to get " << _bitslot << endl;
-		_session.mark_send_id (_bitslot);
+	Delivery::set_state (node, version);
+
+        /* don't try to reset bitslot if its already set: this can cause
+           issues with the session's accounting of send ID's
+        */
+
+        if ((prop = node.property ("bitslot")) == 0) {
+                _bitslot = _session.next_send_id();
+        } else {
+                _session.unmark_send_id (_bitslot);
+                sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+                _session.mark_send_id (_bitslot);
+        }
+
+	XMLNodeList nlist = node.children();
+	for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) {
+		if ((*i)->name() == X_("Processor")) {
+			_amp->set_state (**i, version);
+		}
 	}
 
-	const XMLNode* insert_node = &node;
+	return 0;
+}
 
-	/* XXX need to load automation state & data for amp */
+int
+Send::set_state_2X (const XMLNode& node, int /* version */)
+{
+	/* use the IO's name for the name of the send */
+	XMLNodeList const & children = node.children ();
 
-	Delivery::set_state (*insert_node, version);
+	XMLNodeList::const_iterator i = children.begin();
+	while (i != children.end() && (*i)->name() != X_("Redirect")) {
+		++i;
+	}
+
+	if (i == children.end()) {
+		return -1;
+	}
+
+	XMLNodeList const & grand_children = (*i)->children ();
+	XMLNodeList::const_iterator j = grand_children.begin ();
+	while (j != grand_children.end() && (*j)->name() != X_("IO")) {
+		++j;
+	}
+
+	if (j == grand_children.end()) {
+		return -1;
+	}
+
+	XMLProperty const * prop = (*j)->property (X_("name"));
+	if (!prop) {
+		return -1;
+	}
+
+	set_name (prop->value ());
 
 	return 0;
 }
@@ -186,6 +220,7 @@ Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 	return true;
 }
 
+/** Caller must hold process lock */
 bool
 Send::configure_io (ChanCount in, ChanCount out)
 {
@@ -260,9 +295,10 @@ Send::display_to_user () const
 {
 	/* we ignore Deliver::_display_to_user */
 
-//	if (_role == Listen || _role == MainListen) {
-//		return false;
-//	}
+	if (_role == Listen) {
+                /* don't make the monitor/control/listen send visible */
+		return false;
+	}
 
 	return true;
 }