redesign how XML state, bitslots and names get propagated during copying a send/port insert/return

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

1 files changed, 15 insertions, 12 deletions

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 4be545126b..79384c701e 100644
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -141,15 +141,15 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/)
 	XMLProperty const * prop;
 
 	XMLNodeList children = node.children ();
-
+	
 	for (XMLNodeIterator i = children.begin(); i != children.end(); ++i) {
 
 		if ((*i)->name() == X_("IO")) {
-
+			
 			if ((prop = (*i)->property ("name")) != 0) {
 				set_name (prop->value ());
 			}
-
+			
 			set_id (**i);
 
 			if ((prop = (*i)->property ("active")) != 0) {
@@ -177,17 +177,20 @@ Processor::set_state (const XMLNode& node, int version)
 
 	const XMLProperty *prop;
 	const XMLProperty *legacy_active = 0;
-
-	// may not exist for legacy 3.0 sessions
-	if ((prop = node.property ("name")) != 0) {
-		/* don't let derived classes have a crack at set_name,
-		   as some (like Send) will screw with the one we suggest.
-		*/
-		Processor::set_name (prop->value());
+	bool leave_name_alone = (node.property ("ignore-name") != 0);
+
+	if (!leave_name_alone) {
+		// may not exist for legacy 3.0 sessions
+		if ((prop = node.property ("name")) != 0) {
+			/* don't let derived classes have a crack at set_name,
+			   as some (like Send) will screw with the one we suggest.
+			*/
+			Processor::set_name (prop->value());
+		}
+		
+		set_id (node);
 	}
 
-	set_id (node);
-
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;