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/Get.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/Get.cpp')
-rw-r--r-- | src/server/events/Get.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index 8ffe9319..9ec581a1 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -16,6 +16,7 @@ #include <utility> +#include "ingen/GraphObject.hpp" #include "ingen/Interface.hpp" #include "Broadcaster.hpp" @@ -59,8 +60,8 @@ Get::pre_process() return Event::pre_process_done(SUCCESS); } else if (_uri == "ingen:engine") { return Event::pre_process_done(SUCCESS); - } else if (Raul::Path::is_valid(_uri.str())) { - _object = _engine.engine_store()->find_object(Raul::Path(_uri.str())); + } else if (GraphObject::uri_is_path(_uri)) { + _object = _engine.engine_store()->find_object(GraphObject::uri_to_path(_uri)); return Event::pre_process_done(_object ? SUCCESS : NOT_FOUND, _uri); } else { _plugin = _engine.node_factory()->plugin(_uri); @@ -76,9 +77,9 @@ send_port(Interface* client, const PortImpl* port) props.erase(port->bufs().uris().ingen_value); props.insert(std::make_pair(port->bufs().uris().ingen_value, port->value())); - client->put(port->path(), props); + client->put(port->uri(), props); } else { - client->put(port->path(), port->properties()); + client->put(port->uri(), port->properties()); } } @@ -89,7 +90,7 @@ send_node(Interface* client, const NodeImpl* node) if (plugin->type() == Plugin::Patch) { send_patch(client, (const PatchImpl*)node); } else { - client->put(node->path(), node->properties()); + client->put(node->uri(), node->properties()); for (size_t j = 0; j < node->num_ports(); ++j) { send_port(client, node->port_impl(j)); } @@ -99,11 +100,11 @@ send_node(Interface* client, const NodeImpl* node) static void send_patch(Interface* client, const PatchImpl* patch) { - client->put(patch->path(), + client->put(patch->uri(), patch->properties(Resource::INTERNAL), Resource::INTERNAL); - client->put(patch->path(), + client->put(patch->uri(), patch->properties(Resource::EXTERNAL), Resource::EXTERNAL); |