Consolidate URIs.

Add missing definition to ontology.


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

9 files changed, 20 insertions, 18 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 357f4a4a..1b71cf06 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -239,7 +239,7 @@ App::property_change(const Raul::URI& subject,
                      const Raul::URI& key,
                      const Atom&      value)
 {
-	if (subject == uris().ingen_engine && key == uris().ingen_sampleRate) {
+	if (subject == Raul::URI("ingen:/engine") && key == uris().param_sampleRate) {
 		if (value.type() == forge().Int) {
 			log().info(fmt("Sample rate: %1%\n") % uris().forge.str(value));
 			_sample_rate = value.get<int32_t>();
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 1e1669cb..081cf413 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -424,7 +424,7 @@ GraphBox::event_import()
 void
 GraphBox::event_save()
 {
-	const Atom& document = _graph->get_property(_app->uris().ingen_document);
+	const Atom& document = _graph->get_property(_app->uris().ingen_file);
 	if (!document.is_valid() || document.type() != _app->uris().forge.URI) {
 		event_save_as();
 	} else {
@@ -470,7 +470,7 @@ GraphBox::event_save_as()
 		dialog.set_filter(filt);
 
 		// Set current folder to most sensible default
-		const Atom& document = _graph->get_property(uris.ingen_document);
+		const Atom& document = _graph->get_property(uris.ingen_file);
 		const Atom& dir      = _app->world()->conf().option("graph-directory");
 		if (document.type() == uris.forge.URI)
 			dialog.set_uri(document.ptr<char>());
@@ -540,7 +540,7 @@ GraphBox::event_save_as()
 			const Glib::ustring uri = Glib::filename_to_uri(filename);
 			_app->loader()->save_graph(_graph, uri);
 			const_cast<GraphModel*>(_graph.get())->set_property(
-				uris.ingen_document,
+				uris.ingen_file,
 				_app->forge().alloc_uri(uri.c_str()),
 				Resource::Graph::EXTERNAL);
 			_status_bar->push(
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index bb7c968c..f2a23f9f 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -33,6 +33,7 @@
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/PluginModel.hpp"
+#include "ingen/ingen.h"
 #include "ingen/serialisation/Serialiser.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 
@@ -563,7 +564,7 @@ serialise_arc(GanvEdge* arc, void* data)
 void
 GraphCanvas::copy_selection()
 {
-	static const char* base_uri = "http://drobilla.net/ns/ingen/selection/";
+	static const char* base_uri = INGEN_NS "selection/";
 	Serialisation::Serialiser serialiser(*_app.world());
 	serialiser.start_to_string(_graph->path(), base_uri);
 
@@ -625,7 +626,7 @@ GraphCanvas::paste()
 	}
 
 	ClashAvoider avoider(*_app.store().get(), clipboard, &clipboard);
-	static const char* base_uri = "http://drobilla.net/ns/ingen/selection/";
+	static const char* base_uri = INGEN_NS "selection/";
 	parser->parse_string(_app.world(), &avoider, str, base_uri,
 	                     parent, symbol);
 
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index 7cca3869..3c9004e3 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -108,9 +108,9 @@ GraphPortModule::store_location(double ax, double ay)
 	{
 		Resource::Properties remove;
 		remove.insert(make_pair(uris.ingen_canvasX,
-		                        Resource::Property(uris.wildcard)));
+		                        Resource::Property(uris.patch_wildcard)));
 		remove.insert(make_pair(uris.ingen_canvasY,
-		                        Resource::Property(uris.wildcard)));
+		                        Resource::Property(uris.patch_wildcard)));
 		Resource::Properties add;
 		add.insert(make_pair(uris.ingen_canvasX,
 		                     Resource::Property(x, Resource::Graph::INTERNAL)));
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 7185d9bd..cd801a05 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -403,9 +403,9 @@ NodeModule::store_location(double ax, double ay)
 	{
 		Resource::Properties remove;
 		remove.insert(make_pair(uris.ingen_canvasX,
-		                        Resource::Property(uris.wildcard)));
+		                        Resource::Property(uris.patch_wildcard)));
 		remove.insert(make_pair(uris.ingen_canvasY,
-		                        Resource::Property(uris.wildcard)));
+		                        Resource::Property(uris.patch_wildcard)));
 		Resource::Properties add;
 		add.insert(make_pair(uris.ingen_canvasX, x));
 		add.insert(make_pair(uris.ingen_canvasY, y));
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 3bd0be38..f19913ac 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -92,8 +92,8 @@ void
 ObjectMenu::on_menu_learn()
 {
 	_app->interface()->set_property(_object->uri(),
-			_app->uris().ingen_controlBinding,
-			_app->uris().wildcard);
+	                                _app->uris().midi_binding,
+	                                _app->uris().patch_wildcard);
 }
 
 void
@@ -101,8 +101,8 @@ ObjectMenu::on_menu_unlearn()
 {
 	Resource::Properties remove;
 	remove.insert(std::make_pair(
-			_app->uris().ingen_controlBinding,
-			Resource::Property(_app->uris().wildcard)));
+		              _app->uris().midi_binding,
+		              Resource::Property(_app->uris().patch_wildcard)));
 	_app->interface()->delta(_object->uri(), remove, Resource::Properties());
 }
 
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index babc37a1..9c428dd8 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -150,7 +150,7 @@ PortMenu::on_menu_expose()
 	const Raul::Path  path  = Raul::Path(block->path() + Raul::Symbol("_" + port->symbol()));
 
 	Ingen::Resource r(*_object.get());
-	r.remove_property(uris.lv2_index, uris.wildcard);
+	r.remove_property(uris.lv2_index, uris.patch_wildcard);
 	r.set_property(uris.lv2_symbol, _app->forge().alloc(path.symbol()));
 	r.set_property(uris.lv2_name, _app->forge().alloc(label.c_str()));
 
diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp
index 63c70278..295d3d16 100644
--- a/src/gui/SubgraphModule.cpp
+++ b/src/gui/SubgraphModule.cpp
@@ -72,9 +72,9 @@ SubgraphModule::store_location(double ax, double ay)
 	{
 		Resource::Properties remove;
 		remove.insert(make_pair(uris.ingen_canvasX,
-		                        Resource::Property(uris.wildcard)));
+		                        Resource::Property(uris.patch_wildcard)));
 		remove.insert(make_pair(uris.ingen_canvasY,
-		                        Resource::Property(uris.wildcard)));
+		                        Resource::Property(uris.patch_wildcard)));
 		Resource::Properties add;
 		add.insert(make_pair(uris.ingen_canvasX,
 		                     Resource::Property(x, Resource::Graph::EXTERNAL)));
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 489fbf39..f2cd54e7 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -21,6 +21,7 @@
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
+#include "ingen/ingen.h"
 #include "ingen/runtime_paths.hpp"
 #include "ingen/types.hpp"
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
@@ -28,7 +29,7 @@
 #include "App.hpp"
 #include "GraphBox.hpp"
 
-#define INGEN_LV2_UI_URI "http://drobilla.net/ns/ingen#GraphUIGtk2"
+#define INGEN_LV2_UI_URI INGEN_NS "GraphUIGtk2"
 
 namespace Ingen {