From cb42d2cc4daa09c7d1db5515e39e94b9a5a43447 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 2 Dec 2008 05:49:41 +0000
Subject: Rewrite pretty much everything to do with paths in Serialiser to
 actually make an ounce of sense. Fix various things with nested patches (fix
 tickets #286 #289). Cascade successive pastes nicely.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1840 a436a847-0d15-0410-975c-d299462d15a1
---
 src/shared/Builder.cpp | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

(limited to 'src/shared/Builder.cpp')

diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index 28833fc9..3bd9e75a 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -36,56 +36,68 @@ Builder::Builder(CommonInterface& interface)
 
 
 void
-Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object)
+Builder::build(SharedPtr<const GraphObject> object)
 {
 	SharedPtr<const Patch> patch = PtrCast<const Patch>(object);
 	if (patch) {
 		if (object->path() != "/") {
-			const string path_str = prefix.base() + object->path().substr(1);
+			const string path_str = object->path();
 			_interface.new_patch(path_str, patch->internal_polyphony());
 		}
 
-		build_object(prefix, object);
-		for (Patch::Connections::const_iterator i = patch->connections().begin();
+		build_object(object);
+		/*for (Patch::Connections::const_iterator i = patch->connections().begin();
 				i != patch->connections().end(); ++i) {
-			string base = prefix.base() + object->path().substr(1);
-			_interface.connect(base + (*i)->src_port_path().substr(1),
-			                   base + (*i)->dst_port_path().substr(1));
-		}
+			_interface.connect((*i)->src_port_path(), (*i)->dst_port_path());
+		}*/
 		return;
 	}
 
 	SharedPtr<const Node> node = PtrCast<const Node>(object);
 	if (node) {
-		Raul::Path path = prefix.base() + node->path().substr(1);
+		Raul::Path path = node->path();
 		_interface.new_node(path, node->plugin()->uri());
-		build_object(prefix, object);
+		build_object(object);
 		return;
 	}
 
 	SharedPtr<const Port> port = PtrCast<const Port>(object);
 	if (port) {
-		Raul::Path path = prefix.base() + port->path().substr(1);
+		Raul::Path path = port->path();
 		_interface.new_port(path, port->type().uri(), port->index(), !port->is_input());
-		build_object(prefix, object);
+		build_object(object);
+		return;
+	}
+}
+
+
+void
+Builder::connect(SharedPtr<const GraphObject> object)
+{
+	SharedPtr<const Patch> patch = PtrCast<const Patch>(object);
+	if (patch) {
+		for (Patch::Connections::const_iterator i = patch->connections().begin();
+				i != patch->connections().end(); ++i) {
+			_interface.connect((*i)->src_port_path(), (*i)->dst_port_path());
+		}
 		return;
 	}
 }
 
 
 void
-Builder::build_object(const Raul::Path& prefix, SharedPtr<const GraphObject> object)
+Builder::build_object(SharedPtr<const GraphObject> object)
 {
 	for (GraphObject::Variables::const_iterator i = object->variables().begin();
 			i != object->variables().end(); ++i)
-		_interface.set_variable(prefix.base() + object->path().substr(1), i->first, i->second);
+		_interface.set_variable(object->path(), i->first, i->second);
 
 	for (GraphObject::Properties::const_iterator i = object->properties().begin();
 			i != object->properties().end(); ++i) {
 		if (object->path() == "/")
 			continue;
-		string path_str = prefix.base() + object->path().substr(1);
-		_interface.set_property(prefix.base() + object->path().substr(1), i->first, i->second);
+		string path_str = object->path();
+		_interface.set_property(object->path(), i->first, i->second);
 	}
 }
 
-- 
cgit v1.2.1