Use more sensible URI scheme for Ingen paths.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4889 a436a847-0d15-0410-975c-d299462d15a1

9 files changed, 19 insertions, 19 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index b458bc3c..389020e2 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -197,7 +197,7 @@ void
 App::request_plugins_if_necessary()
 {
 	if (!_requested_plugins) {
-		_world->interface()->get(Raul::URI("ingen:plugins"));
+		_world->interface()->get(Raul::URI("ingen:/plugins"));
 		_requested_plugins = true;
 	}
 }
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 7951b479..36827489 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -255,7 +255,7 @@ ConnectWindow::disconnect()
 void
 ConnectWindow::activate()
 {
-	_app->interface()->set_property(Raul::URI("ingen:driver"),
+	_app->interface()->set_property(Raul::URI("ingen:/driver"),
 	                                _app->uris().ingen_enabled,
 	                                _app->forge().make(true));
 }
@@ -263,7 +263,7 @@ ConnectWindow::activate()
 void
 ConnectWindow::deactivate()
 {
-	_app->interface()->set_property(Raul::URI("ingen:driver"),
+	_app->interface()->set_property(Raul::URI("ingen:/driver"),
 	                                _app->uris().ingen_enabled,
 	                                _app->forge().make(false));
 }
@@ -390,7 +390,7 @@ ConnectWindow::gtk_callback()
 
 		_ping_id = g_random_int();
 		_app->interface()->set_response_id(_ping_id);
-		_app->interface()->get(Raul::URI("ingen:engine"));
+		_app->interface()->get(Raul::URI("ingen:/engine"));
 
 		if (_widgets_loaded) {
 			_progress_label->set_text("Connecting to engine...");
@@ -407,7 +407,7 @@ ConnectWindow::gtk_callback()
 				(now.tv_usec - last.tv_usec) * 0.001f;
 			if (ms_since_last > 1000) {
 				_app->interface()->set_response_id(_ping_id);
-				_app->interface()->get(Raul::URI("ingen:engine"));
+				_app->interface()->get(Raul::URI("ingen:/engine"));
 				last = now;
 			}
 		}
@@ -423,14 +423,14 @@ ConnectWindow::gtk_callback()
 			if (root) {
 				set_connected_to(_app->interface());
 				_app->window_factory()->present_graph(root);
-				_app->interface()->get(Raul::URI("ingen:plugins"));
+				_app->interface()->get(Raul::URI("ingen:/plugins"));
 				if (_widgets_loaded)
 					_progress_label->set_text(string("Loading plugins..."));
 				++_connect_stage;
 			}
 		}
 	} else if (_connect_stage == 4) {
-		_app->interface()->get(Raul::URI("ingen:plugins"));
+		_app->interface()->get(Raul::URI("ingen:/plugins"));
 		hide();
 		if (_widgets_loaded)
 			_progress_label->set_text("Connected to engine");
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index 4c6a5925..3cd2ccf6 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -175,7 +175,7 @@ main(int argc, char** argv)
 		  conf.option("load").get_string() :
 		  conf.files().front();
 
-		engine_interface->get(Raul::URI("ingen:plugins"));
+		engine_interface->get(Raul::URI("ingen:/plugins"));
 		engine_interface->get(Node::root_uri());
 		world->parser()->parse_file(
 			world, engine_interface.get(), path, parent, symbol);
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index 541e8e95..157b07ea 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -123,7 +123,7 @@ public:
 		BROADCAST(set_property, subject, predicate, value);
 	}
 
-	Raul::URI uri() const { return Raul::URI("ingen:broadcaster"); }
+	Raul::URI uri() const { return Raul::URI("ingen:/broadcaster"); }
 
 	void set_response_id(int32_t id) {} ///< N/A
 	void get(const Raul::URI& uri) {} ///< N/A
diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp
index 5c44c5b6..c2fc0b81 100644
--- a/src/server/EventWriter.hpp
+++ b/src/server/EventWriter.hpp
@@ -40,7 +40,7 @@ public:
 	explicit EventWriter(Engine& engine);
 	virtual ~EventWriter();
 
-	Raul::URI uri() const { return Raul::URI("ingen:eventWriter"); }
+	Raul::URI uri() const { return Raul::URI("ingen:/clients/event_writer"); }
 
 	virtual SharedPtr<Interface> respondee() const {
 		return _respondee;
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index 949e8c49..b65b47bf 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -55,10 +55,10 @@ Get::pre_process()
 {
 	_lock.acquire();
 
-	if (_uri == "ingen:plugins") {
+	if (_uri == "ingen:/plugins") {
 		_plugins = _engine.block_factory()->plugins();
 		return Event::pre_process_done(SUCCESS);
-	} else if (_uri == "ingen:engine") {
+	} else if (_uri == "ingen:/engine") {
 		return Event::pre_process_done(SUCCESS);
 	} else if (Node::uri_is_path(_uri)) {
 		_object = _engine.store()->get(Node::uri_to_path(_uri));
@@ -131,9 +131,9 @@ Get::post_process()
 {
 	Broadcaster::Transfer t(*_engine.broadcaster());
 	if (!respond() && _request_client) {
-		if (_uri == "ingen:plugins") {
+		if (_uri == "ingen:/plugins") {
 			_engine.broadcaster()->send_plugins_to(_request_client.get(), _plugins);
-		} else if (_uri == "ingen:engine") {
+		} else if (_uri == "ingen:/engine") {
 			// TODO: Keep a proper RDF model of the engine
 			URIs& uris = _engine.world()->uris();
 			_request_client->set_property(
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index f0a4c2df..f8f4b7c3 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -606,7 +606,7 @@ ingen_instantiate(const LV2_Descriptor*    descriptor,
 	   Since we are not yet rolling, it won't be drained, causing a deadlock. */
 	SharedPtr<Interface> client(&driver->writer(), NullDeleter<Interface>);
 	interface->set_respondee(client);
-	engine->register_client(Raul::URI("ingen:lv2"), client);
+	engine->register_client(Raul::URI("ingen:/clients/lv2"), client);
 
 	return (LV2_Handle)plugin;
 }
diff --git a/src/socket/SocketReader.cpp b/src/socket/SocketReader.cpp
index 12fb112f..cc5da947 100644
--- a/src/socket/SocketReader.cpp
+++ b/src/socket/SocketReader.cpp
@@ -101,9 +101,9 @@ SocketReader::_run()
 		return;
 	}
 
-	// Use <ingen:root/> as base URI so e.g. </foo/bar> will be a path
+	// Use <ingen:/root/> as base URI so e.g. </foo/bar> will be a path
 	SordNode* base_uri = sord_new_uri(
-		world->c_obj(), (const uint8_t*)"ingen:root/");
+		world->c_obj(), (const uint8_t*)"ingen:/root/");
 
 	// Set up sratom and a forge to build LV2 atoms from model
 	Sratom*        sratom = sratom_new(map);
diff --git a/src/socket/SocketWriter.cpp b/src/socket/SocketWriter.cpp
index 19a1c713..d2652dec 100644
--- a/src/socket/SocketWriter.cpp
+++ b/src/socket/SocketWriter.cpp
@@ -50,8 +50,8 @@ SocketWriter::SocketWriter(URIMap&           map,
 	, _uri(uri)
 	, _socket(sock)
 {
-	// Use <ingen:root/> as base URI so e.g. </foo/bar> will be a path
-	_base = serd_node_from_string(SERD_URI, (const uint8_t*)"ingen:root/");
+	// Use <ingen:/root/> as base URI so e.g. </foo/bar> will be a path
+	_base = serd_node_from_string(SERD_URI, (const uint8_t*)"ingen:/root/");
 
 	serd_uri_parse(_base.buf, &_base_uri);