summaryrefslogtreecommitdiffstats
path: root/src/libs/serialisation/Loader.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-07-29 04:39:59 +0000
committerDavid Robillard <d@drobilla.net>2008-07-29 04:39:59 +0000
commitde58b508b28a42b072fb26d2633aa0af37ee7c0e (patch)
treede1ea38fe51dabe98b21f8533885ec3c1030069b /src/libs/serialisation/Loader.cpp
parent99aacf95b16b828ca5f50d7dab34487240d07eff (diff)
downloadingen-de58b508b28a42b072fb26d2633aa0af37ee7c0e.tar.gz
ingen-de58b508b28a42b072fb26d2633aa0af37ee7c0e.tar.bz2
ingen-de58b508b28a42b072fb26d2633aa0af37ee7c0e.zip
Bump Ingen librdf dependency to 1.0.8.
Several serialization fixes. Include Smack 808 Om patches converted to Ingen files. git-svn-id: http://svn.drobilla.net/lad/ingen@1301 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/serialisation/Loader.cpp')
-rw-r--r--src/libs/serialisation/Loader.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp
index da2e6507..6708a0e3 100644
--- a/src/libs/serialisation/Loader.cpp
+++ b/src/libs/serialisation/Loader.cpp
@@ -212,8 +212,9 @@ Loader::load(Ingen::Shared::World* world,
const string port_name = (*i)["portname"].to_string();
const float val = (*i)["portval"].to_float();
- const Path port_path = patch_path.base() + Path::nameify(node_name)
- +"/"+ Path::nameify(port_name);
+ assert(Path::is_valid_name(node_name));
+ assert(Path::is_valid_name(port_name));
+ const Path port_path = patch_path.base() + node_name + "/" + port_name;
world->engine->set_port_value(port_path, "ingen:Float", sizeof(float), &val);
}
@@ -243,7 +244,8 @@ Loader::load(Ingen::Shared::World* world,
const string type = world->rdf_world->qualify((*i)["type"].to_string());
const string datatype = world->rdf_world->qualify((*i)["datatype"].to_string());
- const Path port_path = patch_path.base() + (string)name;
+ assert(Path::is_valid_name(name));
+ const Path port_path = patch_path.base() + name;
if (created.find(port_path) == created.end()) {
bool is_output = (type == "ingen:OutputPort"); // FIXME: check validity