From 2ba09e4b41b01cbd8f8756eb0e3b7e33136e06b3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 15 Feb 2017 22:41:18 +0100 Subject: Move static path stuff to its own header --- src/server/events/Delta.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/events/Delta.cpp') diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 2c13f9d4..0398face 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -137,7 +137,7 @@ Delta::pre_process(PreProcessContext& ctx) { const Ingen::URIs& uris = _engine.world()->uris(); - const bool is_graph_object = Node::uri_is_path(_subject); + const bool is_graph_object = uri_is_path(_subject); const bool is_client = (_subject == "ingen:/clients/this"); const bool is_engine = (_subject == "ingen:/"); const bool is_file = (_subject.substr(0, 5) == "file:"); @@ -158,11 +158,11 @@ Delta::pre_process(PreProcessContext& ctx) } const Raul::URI prot(_engine.world()->forge().str(p->second, false)); - if (!Node::uri_is_path(prot)) { + if (!uri_is_path(prot)) { return Event::pre_process_done(Status::BAD_URI, _subject); } - Node* node = _engine.store()->get(Node::uri_to_path(prot)); + Node* node = _engine.store()->get(uri_to_path(prot)); if (!node) { return Event::pre_process_done(Status::NOT_FOUND, prot); } @@ -182,7 +182,7 @@ Delta::pre_process(PreProcessContext& ctx) std::lock_guard lock(_engine.store()->mutex()); _object = is_graph_object - ? static_cast(_engine.store()->get(Node::uri_to_path(_subject))) + ? static_cast(_engine.store()->get(uri_to_path(_subject))) : static_cast(_engine.block_factory()->plugin(_subject)); if (!_object && !is_client && !is_engine && @@ -191,7 +191,7 @@ Delta::pre_process(PreProcessContext& ctx) } if (is_graph_object && !_object) { - Raul::Path path(Node::uri_to_path(_subject)); + Raul::Path path(uri_to_path(_subject)); bool is_graph = false, is_block = false, is_port = false, is_output = false; Ingen::Resource::type(uris, _properties, is_graph, is_block, is_port, is_output); -- cgit v1.2.1