diff options
| author | David Robillard <d@drobilla.net> | 2012-12-23 00:06:21 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-12-23 00:06:21 +0000 |
| commit | fa8d43dab70a975be9af7aebaac8eba682c2048e (patch) | |
| tree | 4088b328260cb7fc75b0b1211879158752114103 /src/server | |
| parent | f7b865f9ff03b0796ba3c2732b69f70a24faa4d4 (diff) | |
| download | ingen-fa8d43dab70a975be9af7aebaac8eba682c2048e.tar.gz ingen-fa8d43dab70a975be9af7aebaac8eba682c2048e.tar.bz2 ingen-fa8d43dab70a975be9af7aebaac8eba682c2048e.zip | |
Use more sensible URI scheme for Ingen paths.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4889 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/Broadcaster.hpp | 2 | ||||
| -rw-r--r-- | src/server/EventWriter.hpp | 2 | ||||
| -rw-r--r-- | src/server/events/Get.cpp | 8 | ||||
| -rw-r--r-- | src/server/ingen_lv2.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
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; } |