Rename ingen:canvas-x and ingen:canvas-y to ingen:canvasX and ingen:canvasY to avoid writing illegal or ugly Turtle (`-' is not allowed in a local name).

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

9 files changed, 37 insertions, 37 deletions

diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 64e6aa4e..7a45f9bb 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -172,9 +172,9 @@ LoadPatchWindow::ok_clicked()
 		std::list<Glib::ustring> uri_list = get_uris();
 		for (std::list<Glib::ustring>::iterator i = uri_list.begin(); i != uri_list.end(); ++i) {
 			// Cascade
-			Atom& x = _initial_data.find(uris.ingen_canvas_x)->second;
+			Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
 			x = Atom(x.get_float() + 20.0f);
-			Atom& y = _initial_data.find(uris.ingen_canvas_y)->second;
+			Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
 			y = Atom(y.get_float() + 20.0f);
 
 			Raul::Symbol symbol(symbol_from_filename(*i));
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 4869fff2..44add7e8 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -354,9 +354,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
 		}
 
 		// Cascade next node
-		Atom& x = _initial_data.find(uris.ingen_canvas_x)->second;
+		Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
 		x = Atom(x.get_float() + 20.0f);
-		Atom& y = _initial_data.find(uris.ingen_canvas_y)->second;
+		Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
 		y = Atom(y.get_float() + 20.0f);
 	}
 }
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index c45273f5..bef84b2d 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -377,16 +377,16 @@ NodeModule::store_location(double ax, double ay)
 
 	const URIs& uris = app().uris();
 
-	const Atom& existing_x = _node->get_property(uris.ingen_canvas_x);
-	const Atom& existing_y = _node->get_property(uris.ingen_canvas_y);
+	const Atom& existing_x = _node->get_property(uris.ingen_canvasX);
+	const Atom& existing_y = _node->get_property(uris.ingen_canvasY);
 
 	if (x != existing_x && y != existing_y) {
 		Resource::Properties remove;
-		remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
-		remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
+		remove.insert(make_pair(uris.ingen_canvasX, uris.wildcard));
+		remove.insert(make_pair(uris.ingen_canvasY, uris.wildcard));
 		Resource::Properties add;
-		add.insert(make_pair(uris.ingen_canvas_x, x));
-		add.insert(make_pair(uris.ingen_canvas_y, y));
+		add.insert(make_pair(uris.ingen_canvasX, x));
+		add.insert(make_pair(uris.ingen_canvasY, y));
 		app().engine()->delta(_node->path(), remove, add);
 	}
 }
@@ -397,9 +397,9 @@ NodeModule::property_changed(const URI& key, const Atom& value)
 	const Shared::URIs& uris = app().uris();
 	switch (value.type()) {
 	case Atom::FLOAT:
-		if (key == uris.ingen_canvas_x) {
+		if (key == uris.ingen_canvasX) {
 			move_to(value.get_float(), get_y());
-		} else if (key == uris.ingen_canvas_y) {
+		} else if (key == uris.ingen_canvasY) {
 			move_to(get_x(), value.get_float());
 		}
 		break;
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 8b2660c6..0c6d73fa 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -737,11 +737,11 @@ PatchCanvas::paste()
 
 		GraphObject::Properties& props = i->second->properties();
 
-		GraphObject::Properties::iterator x = props.find(uris.ingen_canvas_x);
+		GraphObject::Properties::iterator x = props.find(uris.ingen_canvasX);
 		if (x != i->second->properties().end())
 			x->second = x->second.get_float() + (20.0f * _paste_count);
 
-		GraphObject::Properties::iterator y = props.find(uris.ingen_canvas_y);
+		GraphObject::Properties::iterator y = props.find(uris.ingen_canvasY);
 		if (y != i->second->properties().end())
 			y->second = y->second.get_float() + (20.0f * _paste_count);
 
@@ -841,9 +841,9 @@ PatchCanvas::get_initial_data(Resource::Graph ctx)
 {
 	GraphObject::Properties result;
 	const URIs& uris = _app.uris();
-	result.insert(make_pair(uris.ingen_canvas_x,
+	result.insert(make_pair(uris.ingen_canvasX,
 	                        Resource::Property((float)_last_click_x, ctx)));
-	result.insert(make_pair(uris.ingen_canvas_y,
+	result.insert(make_pair(uris.ingen_canvasY,
 	                        Resource::Property((float)_last_click_y, ctx)));
 	return result;
 }
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 810b1beb..991103ac 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -93,17 +93,17 @@ PatchPortModule::store_location(double ax, double ay)
 
 	const URIs& uris = app().uris();
 
-	const Atom& existing_x = _model->get_property(uris.ingen_canvas_x);
-	const Atom& existing_y = _model->get_property(uris.ingen_canvas_y);
+	const Atom& existing_x = _model->get_property(uris.ingen_canvasX);
+	const Atom& existing_y = _model->get_property(uris.ingen_canvasY);
 
 	if (x != existing_x && y != existing_y) {
 		Resource::Properties remove;
-		remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
-		remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
+		remove.insert(make_pair(uris.ingen_canvasX, uris.wildcard));
+		remove.insert(make_pair(uris.ingen_canvasY, uris.wildcard));
 		Resource::Properties add;
-		add.insert(make_pair(uris.ingen_canvas_x,
+		add.insert(make_pair(uris.ingen_canvasX,
 		                     Resource::Property(x, Resource::INTERNAL)));
-		add.insert(make_pair(uris.ingen_canvas_y,
+		add.insert(make_pair(uris.ingen_canvasY,
 		                     Resource::Property(y, Resource::INTERNAL)));
 		app().engine()->delta(_model->path(), remove, add);
 	}
@@ -133,9 +133,9 @@ PatchPortModule::property_changed(const URI& key, const Atom& value)
 	const URIs& uris = app().uris();
 	switch (value.type()) {
 	case Atom::FLOAT:
-		if (key == uris.ingen_canvas_x) {
+		if (key == uris.ingen_canvasX) {
 			move_to(value.get_float(), get_y());
-		} else if (key == uris.ingen_canvas_y) {
+		} else if (key == uris.ingen_canvasY) {
 			move_to(get_x(), value.get_float());
 		}
 		break;
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 6d4f48e8..21ad0dd8 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -68,17 +68,17 @@ SubpatchModule::store_location(double ax, double ay)
 
 	const URIs& uris = app().uris();
 
-	const Atom& existing_x = _node->get_property(uris.ingen_canvas_x);
-	const Atom& existing_y = _node->get_property(uris.ingen_canvas_y);
+	const Atom& existing_x = _node->get_property(uris.ingen_canvasX);
+	const Atom& existing_y = _node->get_property(uris.ingen_canvasY);
 
 	if (x != existing_x && y != existing_y) {
 		Resource::Properties remove;
-		remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
-		remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
+		remove.insert(make_pair(uris.ingen_canvasX, uris.wildcard));
+		remove.insert(make_pair(uris.ingen_canvasY, uris.wildcard));
 		Resource::Properties add;
-		add.insert(make_pair(uris.ingen_canvas_x,
+		add.insert(make_pair(uris.ingen_canvasX,
 		                     Resource::Property(x, Resource::EXTERNAL)));
-		add.insert(make_pair(uris.ingen_canvas_y,
+		add.insert(make_pair(uris.ingen_canvasY,
 		                     Resource::Property(y, Resource::EXTERNAL)));
 		app().engine()->delta(_node->path(), remove, add);
 	}
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 2bd96a47..1d976edd 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -180,9 +180,9 @@ Engine::activate()
 		in_properties.insert(make_pair(uris.lv2_index, 0));
 		in_properties.insert(make_pair(uris.lv2_portProperty,
 		                               uris.lv2_connectionOptional));
-		in_properties.insert(make_pair(uris.ingen_canvas_x,
+		in_properties.insert(make_pair(uris.ingen_canvasX,
 		                               Resource::Property(32.0f, Resource::EXTERNAL)));
-		in_properties.insert(make_pair(uris.ingen_canvas_y,
+		in_properties.insert(make_pair(uris.ingen_canvasY,
 		                               Resource::Property(32.0f, Resource::EXTERNAL)));
 
 		execute_and_delete_event(
@@ -196,9 +196,9 @@ Engine::activate()
 		out_properties.insert(make_pair(uris.lv2_index, 1));
 		in_properties.insert(make_pair(uris.lv2_portProperty,
 		                               uris.lv2_connectionOptional));
-		out_properties.insert(make_pair(uris.ingen_canvas_x,
+		out_properties.insert(make_pair(uris.ingen_canvasX,
 		                                Resource::Property(128.0f, Resource::EXTERNAL)));
-		out_properties.insert(make_pair(uris.ingen_canvas_y,
+		out_properties.insert(make_pair(uris.ingen_canvasY,
 		                                Resource::Property(32.0f, Resource::EXTERNAL)));
 
 		execute_and_delete_event(
diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp
index 1aaa549f..c431abc3 100644
--- a/src/shared/URIs.cpp
+++ b/src/shared/URIs.cpp
@@ -84,8 +84,8 @@ URIs::URIs()
 	, ingen_sampleRate      (NS_INGEN "sampleRate")
 	, ingen_selected        (NS_INGEN "selected")
 	, ingen_value           (NS_INGEN "value")
-	, ingen_canvas_x        (NS_INGEN "canvas-x")
-	, ingen_canvas_y        (NS_INGEN "canvas-y")
+	, ingen_canvasX         (NS_INGEN "canvasX")
+	, ingen_canvasY         (NS_INGEN "canvasY")
 	, lv2_AudioPort         (NS_LV2 "AudioPort")
 	, lv2_ControlPort       (NS_LV2 "ControlPort")
 	, lv2_InputPort         (NS_LV2 "InputPort")
diff --git a/src/shared/wscript b/src/shared/wscript
index 42d99f0a..b1cb6d17 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -10,7 +10,7 @@ def build(bld):
               vnum            = '0.0.0',
               install_path    = '${LIBDIR}',
               lib             = ['dl'])
-    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV RAUL SORD')
+    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV RAUL SORD LV2_MIDI')
 
     obj.source = '''
             Builder.cpp