Update URIs.

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

2 files changed, 9 insertions, 6 deletions

diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index b6013d05..2307e5fe 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -23,6 +23,9 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/log.hpp"
 
+#include "lv2/lv2plug.in/ns/ext/port-props/port-props.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+
 #include "ingen/Port.hpp"
 #include "ingen/client/ObjectModel.hpp"
 
@@ -50,12 +53,12 @@ public:
 
 	bool port_property(const Raul::URI& uri) const;
 
-	bool is_logarithmic() const { return port_property("http://drobilla.net/ns/ingen#logarithmic"); }
-	bool is_integer()     const { return port_property("http://lv2plug.in/ns/lv2core#integer"); }
-	bool is_toggle()      const { return port_property("http://lv2plug.in/ns/lv2core#toggled"); }
+	bool is_logarithmic() const { return port_property(LV2_PORT_PROPS__logarithmic); }
+	bool is_integer()     const { return port_property(LV2_CORE__integer); }
+	bool is_toggle()      const { return port_property(LV2_CORE__toggled); }
 	bool is_numeric()     const {
-		return ObjectModel::is_a("http://lv2plug.in/ns/lv2core#ControlPort")
-			|| ObjectModel::is_a("http://lv2plug.in/ns/ext/cv-port#CVPort");
+		return ObjectModel::is_a(LV2_CORE__ControlPort)
+			|| ObjectModel::is_a(LV2_CORE__CVPort);
 	}
 
 	inline bool operator==(const PortModel& pm) const { return (path() == pm.path()); }
diff --git a/ingen/shared/URIs.hpp b/ingen/shared/URIs.hpp
index ec199ef7..5fe3c9db 100644
--- a/ingen/shared/URIs.hpp
+++ b/ingen/shared/URIs.hpp
@@ -59,7 +59,6 @@ public:
 	const Quark atom_bufferType;
 	const Quark atom_eventTransfer;
 	const Quark atom_supports;
-	const Quark cv_CVPort;
 	const Quark doap_name;
 	const Quark ingen_Connection;
 	const Quark ingen_Internal;
@@ -84,6 +83,7 @@ public:
 	const Quark ingen_source;
 	const Quark ingen_value;
 	const Quark lv2_AudioPort;
+	const Quark lv2_CVPort;
 	const Quark lv2_ControlPort;
 	const Quark lv2_InputPort;
 	const Quark lv2_OutputPort;