summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-09-29 13:51:22 +0000
committerDavid Robillard <d@drobilla.net>2015-09-29 13:51:22 +0000
commitdc6bde36430e1e2da21b3b81f691ea6f31d672be (patch)
treeb382db493db7a7b066fd4c5a603ba23f9de11057 /ingen
parent3368d57a40527bf1151b5a7d1edcba60d0560539 (diff)
downloadingen-dc6bde36430e1e2da21b3b81f691ea6f31d672be.tar.gz
ingen-dc6bde36430e1e2da21b3b81f691ea6f31d672be.tar.bz2
ingen-dc6bde36430e1e2da21b3b81f691ea6f31d672be.zip
Fix more URI conversion issues.
Fixes #1088. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5733 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen')
-rw-r--r--ingen/URIs.hpp1
-rw-r--r--ingen/client/ObjectModel.hpp2
-rw-r--r--ingen/client/PortModel.hpp16
3 files changed, 10 insertions, 9 deletions
diff --git a/ingen/URIs.hpp b/ingen/URIs.hpp
index 7ef4385b..a76e6dce 100644
--- a/ingen/URIs.hpp
+++ b/ingen/URIs.hpp
@@ -135,6 +135,7 @@ public:
const Quark lv2_connectionOptional;
const Quark lv2_default;
const Quark lv2_designation;
+ const Quark lv2_enumeration;
const Quark lv2_extensionData;
const Quark lv2_index;
const Quark lv2_integer;
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index 69601bc2..42849110 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -58,7 +58,7 @@ class INGEN_API ObjectModel : public Node
public:
virtual ~ObjectModel();
- bool is_a(const Raul::URI& type) const;
+ bool is_a(const URIs::Quark& type) const;
const Atom& get_property(const Raul::URI& key) const;
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index 8fe7e445..0d921fb1 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -42,7 +42,7 @@ public:
GraphType graph_type() const { return Node::GraphType::PORT; }
- bool supports(const Raul::URI& value_type) const;
+ bool supports(const URIs::Quark& value_type) const;
inline uint32_t index() const { return _index; }
inline const Atom& value() const { return get_property(_uris.ingen_value); }
@@ -50,15 +50,15 @@ public:
inline bool is_input() const { return (_direction == Direction::INPUT); }
inline bool is_output() const { return (_direction == Direction::OUTPUT); }
- bool port_property(const Raul::URI& uri) const;
+ bool port_property(const URIs::Quark& uri) const;
- 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_logarithmic() const { return port_property(_uris.pprops_logarithmic); }
+ bool is_enumeration() const { return port_property(_uris.lv2_enumeration); }
+ bool is_integer() const { return port_property(_uris.lv2_integer); }
+ bool is_toggle() const { return port_property(_uris.lv2_toggled); }
bool is_numeric() const {
- return ObjectModel::is_a(Raul::URI(LV2_CORE__ControlPort))
- || ObjectModel::is_a(Raul::URI(LV2_CORE__CVPort));
+ return ObjectModel::is_a(_uris.lv2_ControlPort)
+ || ObjectModel::is_a(_uris.lv2_CVPort);
}
bool is_uri() const;