revisit setting up processors during route construction; remove several more XML-based constructors; don't put () parens around inactive plugin names (we have a checkbox); improve management of send, return and insert bitslot IDs; clean up Diskstream construction a bit more

git-svn-id: svn://localhost/ardour2/branches/3.0@6819 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 10 deletions

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index 39acf0ddf1..086490c1cb 100644
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -45,12 +45,11 @@ Return::Return (Session& s, bool internal)
 
 	_amp.reset (new Amp (_session, boost::shared_ptr<MuteMaster>()));
 	_meter.reset (new PeakMeter (_session));
-
-	ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Return::~Return ()
 {
+        _session.unmark_return_id (_bitslot);
 }
 
 XMLNode&
@@ -77,14 +76,6 @@ Return::set_state (const XMLNode& node, int version)
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;
 	const XMLProperty* prop;
-
-	if ((prop = node.property ("bitslot")) == 0) {
-		_bitslot = _session.next_return_id();
-	} else {
-		sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-		_session.mark_return_id (_bitslot);
-	}
-
 	const XMLNode* insert_node = &node;
 
 	/* Return has regular IO automation (gain, pan) */
@@ -99,6 +90,17 @@ Return::set_state (const XMLNode& node, int version)
 
 	IOProcessor::set_state (*insert_node, version);
 
+	if ((prop = node.property ("bitslot")) == 0) {
+		_bitslot = _session.next_return_id();
+	} else {
+                _session.unmark_return_id (_bitslot);
+		sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+		_session.mark_return_id (_bitslot);
+	}
+        
+        set_name (string_compose (_("return %1"), _bitslot));
+
+
 	return 0;
 }