Update URIs.

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

8 files changed, 15 insertions, 12 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;
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 1a9fc45d..38685d5b 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -396,7 +396,7 @@ bool
 App::can_control(const Client::PortModel* port) const
 {
 	return port->is_a(uris().lv2_ControlPort)
-		|| port->is_a(uris().cv_CVPort)
+		|| port->is_a(uris().lv2_CVPort)
 		|| (port->is_a(uris().atom_AtomPort)
 				&& (port->supports(uris().atom_Float)
 					|| port->supports(uris().atom_String)));
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 9d437ef1..5cbfd38a 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -92,7 +92,7 @@ ControlPanel::add_port(SharedPtr<const PortModel> pm)
 			WidgetFactory::get_widget_derived("toggle_control", tc);
 			control = tc;
 		} else if (pm->is_a(_app->uris().lv2_ControlPort)
-		           || pm->is_a(_app->uris().cv_CVPort)
+		           || pm->is_a(_app->uris().lv2_CVPort)
 		           || pm->supports(_app->uris().atom_Float)) {
 			SliderControl* sc;
 			WidgetFactory::get_widget_derived("control_strip", sc);
diff --git a/src/server/LV2Info.cpp b/src/server/LV2Info.cpp
index 6574028f..eebc1813 100644
--- a/src/server/LV2Info.cpp
+++ b/src/server/LV2Info.cpp
@@ -37,7 +37,7 @@ LV2Info::LV2Info(Ingen::Shared::World* world)
 	: input_class(lilv_new_uri(world->lilv_world(), LV2_CORE__InputPort))
 	, output_class(lilv_new_uri(world->lilv_world(), LV2_CORE__OutputPort))
 	, control_class(lilv_new_uri(world->lilv_world(), LV2_CORE__ControlPort))
-	, cv_class(lilv_new_uri(world->lilv_world(), "http://lv2plug.in/ns/ext/cv-port#CVPort"))
+	, cv_class(lilv_new_uri(world->lilv_world(), LV2_CORE__CVPort))
 	, audio_class(lilv_new_uri(world->lilv_world(), LV2_CORE__AudioPort))
 	, atom_port_class(lilv_new_uri(world->lilv_world(), LV2_ATOM__AtomPort))
 	, _world(world)
diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp
index bd4c5819..41b6f636 100644
--- a/src/server/PortType.hpp
+++ b/src/server/PortType.hpp
@@ -76,7 +76,7 @@ private:
 			"http://drobilla.net/ns/ingen#nil",
 			"http://lv2plug.in/ns/lv2core#AudioPort",
 			"http://lv2plug.in/ns/lv2core#ControlPort",
-			"http://lv2plug.in/ns/ext/cv-port#CVPort",
+			"http://lv2plug.in/ns/lv2core#CVPort",
 			"http://lv2plug.in/ns/ext/atom#AtomPort"
 		};
 		return uris[symbol_num];
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 92d9a74a..e9589eaa 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -69,7 +69,7 @@ CreatePort::CreatePort(Engine&                     engine,
 			_port_type = PortType::AUDIO;
 		} else if (type == uris.lv2_ControlPort) {
 			_port_type = PortType::CONTROL;
-		} else if (type == uris.cv_CVPort) {
+		} else if (type == uris.lv2_CVPort) {
 			_port_type = PortType::CV;
 		} else if (type == uris.atom_AtomPort) {
 			_port_type = PortType::ATOM;
diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp
index ae14782a..eeedb3f3 100644
--- a/src/shared/URIs.cpp
+++ b/src/shared/URIs.cpp
@@ -63,7 +63,6 @@ URIs::URIs(Ingen::Forge& f, LV2URIMap* map)
 	, atom_bufferType       (forge, map, LV2_ATOM__bufferType)
 	, atom_eventTransfer    (forge, map, LV2_ATOM__eventTransfer)
 	, atom_supports         (forge, map, LV2_ATOM__supports)
-	, cv_CVPort             (forge, map, "http://lv2plug.in/ns/ext/cv-port#CVPort")
 	, doap_name             (forge, map, "http://usefulinc.com/ns/doap#name")
 	, ingen_Connection      (forge, map, NS_INGEN "Connection")
 	, ingen_Internal        (forge, map, NS_INGEN "Internal")
@@ -88,6 +87,7 @@ URIs::URIs(Ingen::Forge& f, LV2URIMap* map)
 	, ingen_source          (forge, map, NS_INGEN "source")
 	, ingen_value           (forge, map, NS_INGEN "value")
 	, lv2_AudioPort         (forge, map, LV2_CORE__AudioPort)
+	, lv2_CVPort            (forge, map, LV2_CORE__CVPort)
 	, lv2_ControlPort       (forge, map, LV2_CORE__ControlPort)
 	, lv2_InputPort         (forge, map, LV2_CORE__InputPort)
 	, lv2_OutputPort        (forge, map, LV2_CORE__OutputPort)