diff options
author | David Robillard <d@drobilla.net> | 2012-08-12 23:42:17 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-08-12 23:42:17 +0000 |
commit | efe8e2311ee2fed881f95cc1e72825906d21c7c1 (patch) | |
tree | 371c03610f691f0b97137b9e5b2f756b21fc5583 /src/server/events/CreateNode.cpp | |
parent | e63caf72f320ab683de6378ff6f2944890054cbf (diff) | |
download | ingen-efe8e2311ee2fed881f95cc1e72825906d21c7c1.tar.gz ingen-efe8e2311ee2fed881f95cc1e72825906d21c7c1.tar.bz2 ingen-efe8e2311ee2fed881f95cc1e72825906d21c7c1.zip |
Use ingen:root as the path for the root patch, opening up path space for engine/driver/etc.
Strict conversion between Path and URI (Path no longer is-a URI).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4672 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/CreateNode.cpp')
-rw-r--r-- | src/server/events/CreateNode.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp index 27b5ce50..0c3e34bf 100644 --- a/src/server/events/CreateNode.cpp +++ b/src/server/events/CreateNode.cpp @@ -66,16 +66,16 @@ CreateNode::pre_process() } if (_engine.engine_store()->find_object(_path)) { - return Event::pre_process_done(EXISTS, _path.str()); + return Event::pre_process_done(EXISTS, _path); } if (!(_patch = _engine.engine_store()->find_patch(_path.parent()))) { - return Event::pre_process_done(PARENT_NOT_FOUND, _path.parent().str()); + return Event::pre_process_done(PARENT_NOT_FOUND, _path.parent()); } PluginImpl* plugin = _engine.node_factory()->plugin(plugin_uri); if (!plugin) { - return Event::pre_process_done(PLUGIN_NOT_FOUND, plugin_uri); + return Event::pre_process_done(PLUGIN_NOT_FOUND, Raul::URI(plugin_uri)); } const iterator p = _properties.find(uris.ingen_polyphonic); @@ -89,7 +89,7 @@ CreateNode::pre_process() polyphonic, _patch, _engine))) { - return Event::pre_process_done(CREATION_FAILED, _path.str()); + return Event::pre_process_done(CREATION_FAILED, _path); } _node->properties().insert(_properties.begin(), _properties.end()); @@ -106,13 +106,13 @@ CreateNode::pre_process() _compiled_patch = _patch->compile(); } - _update.push_back(make_pair(_node->path(), _node->properties())); + _update.push_back(make_pair(_node->uri(), _node->properties())); for (uint32_t i = 0; i < _node->num_ports(); ++i) { const PortImpl* port = _node->port_impl(i); Resource::Properties pprops = port->properties(); pprops.erase(uris.ingen_value); pprops.insert(std::make_pair(uris.ingen_value, port->value())); - _update.push_back(std::make_pair(port->path(), pprops)); + _update.push_back(std::make_pair(port->uri(), pprops)); } return Event::pre_process_done(SUCCESS); |