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 /ingen | |
| 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 'ingen')
| -rw-r--r-- | ingen/AtomWriter.hpp | 2 | ||||
| -rw-r--r-- | ingen/ClashAvoider.hpp | 2 | ||||
| -rw-r--r-- | ingen/Node.hpp | 5 | ||||
| -rw-r--r-- | ingen/client/ClientStore.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/SigClientInterface.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/ThreadedSigClientInterface.hpp | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp index 37f91e74..00b64b54 100644 --- a/ingen/AtomWriter.hpp +++ b/ingen/AtomWriter.hpp @@ -37,7 +37,7 @@ public: ~AtomWriter() {} Raul::URI uri() const { - return Raul::URI("http://drobilla.net/ns/ingen#AtomWriter"); + return Raul::URI("ingen:/clients/atom_writer"); } void bundle_begin(); diff --git a/ingen/ClashAvoider.hpp b/ingen/ClashAvoider.hpp index 49a3000a..e3ff519b 100644 --- a/ingen/ClashAvoider.hpp +++ b/ingen/ClashAvoider.hpp @@ -44,7 +44,7 @@ public: ClashAvoider(Store& store, Interface& target, Store* also_avoid=NULL) : _store(store), _target(target), _also_avoid(also_avoid) {} - Raul::URI uri() const { return Raul::URI("ingen:ClientStore"); } + Raul::URI uri() const { return Raul::URI("ingen:/clients/clash_avoider"); } void set_target(Interface& target) { _target = target; } diff --git a/ingen/Node.hpp b/ingen/Node.hpp index 275c82cc..db796ef7 100644 --- a/ingen/Node.hpp +++ b/ingen/Node.hpp @@ -72,10 +72,11 @@ public: virtual const Raul::Symbol& symbol() const = 0; virtual Node* graph_parent() const = 0; - static Raul::URI root_uri() { return Raul::URI("ingen:root"); } + static Raul::URI root_uri() { return Raul::URI("ingen:/root"); } static bool uri_is_path(const Raul::URI& uri) { - return uri.substr(0, root_uri().length() + 1) == root_uri() + "/"; + return uri == root_uri() || + uri.substr(0, root_uri().length() + 1) == root_uri() + "/"; } static Raul::Path uri_to_path(const Raul::URI& uri) { diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index 2ca25dde..fa5b2f5a 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -58,7 +58,7 @@ public: SharedPtr<Interface> engine = SharedPtr<Interface>(), SharedPtr<SigClientInterface> emitter = SharedPtr<SigClientInterface>()); - Raul::URI uri() const { return Raul::URI("ingen:clientStore"); } + Raul::URI uri() const { return Raul::URI("ingen:/clients/store"); } SharedPtr<const ObjectModel> object(const Raul::Path& path) const; SharedPtr<const PluginModel> plugin(const Raul::URI& uri) const; diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp index dc6676f7..2453440f 100644 --- a/ingen/client/SigClientInterface.hpp +++ b/ingen/client/SigClientInterface.hpp @@ -45,7 +45,7 @@ class SigClientInterface : public Ingen::Interface, public: SigClientInterface() {} - Raul::URI uri() const { return Raul::URI("ingen:sigClient"); } + Raul::URI uri() const { return Raul::URI("ingen:/clients/sig"); } INGEN_SIGNAL(response, void, int32_t, Status, std::string) INGEN_SIGNAL(bundle_begin, void) diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp index a89108bc..0b53a15a 100644 --- a/ingen/client/ThreadedSigClientInterface.hpp +++ b/ingen/client/ThreadedSigClientInterface.hpp @@ -65,7 +65,7 @@ public: , property_change_slot(_signal_property_change.make_slot()) {} - virtual Raul::URI uri() const { return Raul::URI("ingen:threadedSigClient"); } + virtual Raul::URI uri() const { return Raul::URI("ingen:/clients/sig_queue"); } void bundle_begin() { push_sig(bundle_begin_slot); } |