Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it.

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

1 files changed, 1 insertions, 21 deletions

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 532d010680..7d6f44b786 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -974,27 +974,7 @@ int
 Session::load_options (const XMLNode& node)
 {
 	LocaleGuard lg (X_("POSIX"));
-
-	/* Copy the node */
-	XMLNode node_copy = node;
-	
-	/* XXX: evil hack: fix up sessions from before the layering alterations
-	   (during A3 beta)
-	*/
-	
-	XMLNodeList children = node_copy.children ();
-	for (XMLNodeIterator i = children.begin(); i != children.end(); ++i) {
-		XMLProperty* p = (*i)->property (X_("name"));
-		if (p && p->name() == X_("name") && p->value() == X_("layer-model") ) {
-			p = (*i)->property (X_("value"));
-			if (p && p->value() == X_("MoveAddHigher")) {
-				(*i)->add_property (X_("value"), X_("AddOrBoundsChangeHigher"));
-			}
-		}
-	}
-	
-	config.set_variables (node_copy);
-	
+	config.set_variables (node);
 	return 0;
 }