summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-03-14 01:37:24 +0000
committerDavid Robillard <d@drobilla.net>2008-03-14 01:37:24 +0000
commita6ab331fb757ff0f20d9b7c2fd0079210b303d96 (patch)
tree5231c1c3f15772ef397c10155796e98aa160a54c
parent77f45891e9948abe0c689210f488ae9347b725ad (diff)
downloadingen-a6ab331fb757ff0f20d9b7c2fd0079210b303d96.tar.gz
ingen-a6ab331fb757ff0f20d9b7c2fd0079210b303d96.tar.bz2
ingen-a6ab331fb757ff0f20d9b7c2fd0079210b303d96.zip
More lenient patch loading.
git-svn-id: http://svn.drobilla.net/lad/ingen@1166 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/libs/serialisation/Loader.cpp27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp
index 39613a64..c53755f5 100644
--- a/src/libs/serialisation/Loader.cpp
+++ b/src/libs/serialisation/Loader.cpp
@@ -56,14 +56,14 @@ Loader::load(SharedPtr<EngineInterface> engine,
std::set<Path> created;
- Redland::Model model(*rdf_world, document_uri);
+ Redland::Model model(*rdf_world, document_uri, document_uri);
if (patch_uri == "")
patch_uri = string("<") + document_uri + ">";
else
patch_uri = string("<") + patch_uri + ">";
- cout << "[Loader] Loading " << patch_uri;
+ cout << "[Loader] Loading " << patch_uri << endl;
size_t patch_poly = 1;
@@ -208,7 +208,8 @@ Loader::load(SharedPtr<EngineInterface> engine,
const string port_name = (*i)["portname"].to_string();
const float val = (*i)["portval"].to_float();
- const Path port_path = patch_path.base() + node_name +"/"+ port_name;
+ const Path port_path = patch_path.base() + Path::nameify(node_name)
+ +"/"+ Path::nameify(port_name);
engine->set_port_value(port_path, "ingen:control", sizeof(float), &val);
}
@@ -280,10 +281,10 @@ Loader::load(SharedPtr<EngineInterface> engine,
results = query.run(*rdf_world, model);
for (Redland::Query::Results::iterator i = results.begin(); i != results.end(); ++i) {
- Path src_node = patch_path.base() + (*i)["srcnodename"].to_string();
- Path src_port = src_node.base() + (*i)["srcname"].to_string();
- Path dst_node = patch_path.base() + (*i)["dstnodename"].to_string();
- Path dst_port = dst_node.base() + (*i)["dstname"].to_string();
+ Path src_node = patch_path.base() + Path::nameify((*i)["srcnodename"].to_string());
+ Path src_port = src_node.base() + Path::nameify((*i)["srcname"].to_string());
+ Path dst_node = patch_path.base() + Path::nameify((*i)["dstnodename"].to_string());
+ Path dst_port = dst_node.base() + Path::nameify((*i)["dstname"].to_string());
//cerr << patch_path << " 1 CONNECTION: " << src_port << " -> " << dst_port << endl;
@@ -307,9 +308,9 @@ Loader::load(SharedPtr<EngineInterface> engine,
results = query.run(*rdf_world, model);
for (Redland::Query::Results::iterator i = results.begin(); i != results.end(); ++i) {
- Path src_port = patch_path.base() + (*i)["srcname"].to_string();
- Path dst_node = patch_path.base() + (*i)["dstnodename"].to_string();
- Path dst_port = dst_node.base() + (*i)["dstname"].to_string();
+ Path src_port = patch_path.base() + Path::nameify((*i)["srcname"].to_string());
+ Path dst_node = patch_path.base() + Path::nameify((*i)["dstnodename"].to_string());
+ Path dst_port = dst_node.base() + Path::nameify((*i)["dstname"].to_string());
//cerr << patch_path << " 2 CONNECTION: " << src_port << " -> " << dst_port << endl;
@@ -333,9 +334,9 @@ Loader::load(SharedPtr<EngineInterface> engine,
results = query.run(*rdf_world, model);
for (Redland::Query::Results::iterator i = results.begin(); i != results.end(); ++i) {
- Path dst_port = patch_path.base() + (*i)["dstname"].to_string();
- Path src_node = patch_path.base() + (*i)["srcnodename"].to_string();
- Path src_port = src_node.base() + (*i)["srcname"].to_string();
+ Path dst_port = patch_path.base() + Path::nameify((*i)["dstname"].to_string());
+ Path src_node = patch_path.base() + Path::nameify((*i)["srcnodename"].to_string());
+ Path src_port = src_node.base() + Path::nameify((*i)["srcname"].to_string());
//cerr << patch_path << " 3 CONNECTION: " << src_port << " -> " << dst_port << endl;