X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=4624006ca9b7aac604a196f2eae84e94b0f08eec;hb=c8e3f32533cc6f4481222781d93e7bf7c32ffe5f;hp=1bb03642d070612698e8205484afd2e311f591fa;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 1bb03642d0..4624006ca9 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -42,29 +42,13 @@ 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)
 	, _metering (false)
 {
-	_amp.reset (new Amp (_session, _mute_master));
+	_amp.reset (new Amp (_session));
 	_meter.reset (new PeakMeter (_session));
-
-	ProcessorCreated (this); /* EMIT SIGNAL */
-}
-
-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));
-	_meter.reset (new PeakMeter (_session));
-
-	if (set_state (node, version)) {
-		throw failed_constructor();
-	}
-
-	ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Send::~Send ()
 {
-	drop_references ();
+        _session.unmark_send_id (_bitslot);
 }
 
 void
@@ -140,7 +124,7 @@ Send::get_state(void)
 }
 
 XMLNode&
-Send::state(bool full)
+Send::state (bool full)
 {
 	XMLNode& node = Delivery::state(full);
 	char buf[32];
@@ -159,19 +143,21 @@ Send::set_state (const XMLNode& node, int version)
 	XMLNodeIterator niter;
 	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);
 
-	const XMLNode* insert_node = &node;
+        /* don't try to reset bitslot if its already set: this can cause
+           issues with the session's accounting of send ID's
+        */
 
-	/* XXX need to load automation state & data for amp */
+        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);
+        }
 
-	Delivery::set_state (*insert_node, version);
+	/* XXX need to load automation state & data for amp */
 
 	return 0;
 }
@@ -262,6 +248,7 @@ Send::display_to_user () const
 	/* we ignore Deliver::_display_to_user */
 
 	if (_role == Listen) {
+                /* don't make the monitor/control/listen send visible */
 		return false;
 	}