diff options
| author | David Robillard <d@drobilla.net> | 2012-08-14 04:23:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-08-14 04:23:23 +0000 |
| commit | 80fee5c311fdbdeda573ec81f59158a5fc87d0a1 (patch) | |
| tree | 8e7e5a6c9bda32bbe0ae8e8c9f6ab23e44c7c181 /ingen/client | |
| parent | 058eaf65642268047a984a5c80d54a1f62a85130 (diff) | |
| download | ingen-80fee5c311fdbdeda573ec81f59158a5fc87d0a1.tar.gz ingen-80fee5c311fdbdeda573ec81f59158a5fc87d0a1.tar.bz2 ingen-80fee5c311fdbdeda573ec81f59158a5fc87d0a1.zip | |
Update for latest Raul.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4687 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen/client')
| -rw-r--r-- | ingen/client/ClientStore.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/PatchModel.hpp | 3 | ||||
| -rw-r--r-- | ingen/client/PortModel.hpp | 12 | ||||
| -rw-r--r-- | ingen/client/SigClientInterface.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/ThreadedSigClientInterface.hpp | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index 720164d0..3762dcb0 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -59,7 +59,7 @@ public: SharedPtr<Interface> engine = SharedPtr<Interface>(), SharedPtr<SigClientInterface> emitter = SharedPtr<SigClientInterface>()); - Raul::URI uri() const { return "ingen:ClientStore"; } + Raul::URI uri() const { return Raul::URI("ingen:clientStore"); } SharedPtr<const ObjectModel> object(const Raul::Path& path) const; SharedPtr<const PluginModel> plugin(const Raul::URI& uri) const; diff --git a/ingen/client/PatchModel.hpp b/ingen/client/PatchModel.hpp index 64ef3d18..d4c8f511 100644 --- a/ingen/client/PatchModel.hpp +++ b/ingen/client/PatchModel.hpp @@ -54,7 +54,8 @@ private: friend class ClientStore; PatchModel(URIs& uris, const Raul::Path& patch_path) - : NodeModel(uris, "http://drobilla.net/ns/ingen#Patch", patch_path) + : NodeModel( + uris, Raul::URI("http://drobilla.net/ns/ingen#Patch"), patch_path) { } diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp index 1a5a31be..a59de578 100644 --- a/ingen/client/PortModel.hpp +++ b/ingen/client/PortModel.hpp @@ -54,13 +54,13 @@ public: bool port_property(const Raul::URI& uri) const; - bool is_logarithmic() const { return port_property(LV2_PORT_PROPS__logarithmic); } - bool is_enumeration() const { return port_property(LV2_CORE__enumeration); } - bool is_integer() const { return port_property(LV2_CORE__integer); } - bool is_toggle() const { return port_property(LV2_CORE__toggled); } + bool is_logarithmic() const { return port_property(Raul::URI(LV2_PORT_PROPS__logarithmic)); } + bool is_enumeration() const { return port_property(Raul::URI(LV2_CORE__enumeration)); } + bool is_integer() const { return port_property(Raul::URI(LV2_CORE__integer)); } + bool is_toggle() const { return port_property(Raul::URI(LV2_CORE__toggled)); } bool is_numeric() const { - return ObjectModel::is_a(LV2_CORE__ControlPort) - || ObjectModel::is_a(LV2_CORE__CVPort); + return ObjectModel::is_a(Raul::URI(LV2_CORE__ControlPort)) + || ObjectModel::is_a(Raul::URI(LV2_CORE__CVPort)); } inline bool operator==(const PortModel& pm) const { return (path() == pm.path()); } diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp index 4aef5a40..a330d31e 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 "http://drobilla.net/ns/ingen#internal"; } + Raul::URI uri() const { return Raul::URI("ingen:sigClient"); } 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 c321f438..a6028cc6 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 "http://drobilla.net/ns/ingen#internal"; } + virtual Raul::URI uri() const { return Raul::URI("ingen:threadedSigClient"); } void bundle_begin() { push_sig(bundle_begin_slot); } |