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/Delta.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/Delta.cpp')
-rw-r--r-- | src/server/events/Delta.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 91980837..18f35ab6 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -105,13 +105,13 @@ Delta::pre_process() { typedef Properties::const_iterator iterator; - const bool is_graph_object = Raul::Path::is_path(_subject); + const bool is_graph_object = GraphObject::uri_is_path(_subject); // Take a writer lock while we modify the store Glib::RWLock::WriterLock lock(_engine.engine_store()->lock()); _object = is_graph_object - ? _engine.engine_store()->find_object(Raul::Path(_subject.str())) + ? _engine.engine_store()->find_object(GraphObject::uri_to_path(_subject)) : static_cast<Ingen::Resource*>(_engine.node_factory()->plugin(_subject)); if (!_object && (!is_graph_object || !_create)) { @@ -121,7 +121,7 @@ Delta::pre_process() const Ingen::URIs& uris = _engine.world()->uris(); if (is_graph_object && !_object) { - Raul::Path path(_subject.str()); + Raul::Path path(GraphObject::uri_to_path(_subject)); bool is_patch = false, is_node = false, is_port = false, is_output = false; Ingen::Resource::type(uris, _properties, is_patch, is_node, is_port, is_output); @@ -139,7 +139,7 @@ Delta::pre_process() if (_create_event) { _create_event->pre_process(); // Grab the object for applying properties, if the create-event succeeded - _object = _engine.engine_store()->find_object(Raul::Path(_subject.str())); + _object = _engine.engine_store()->find_object(path); } else { return Event::pre_process_done(BAD_OBJECT_TYPE, _subject); } |