Updated LV2 spec.

git-svn-id: http://svn.drobilla.net/lad/slv2@602 a436a847-0d15-0410-975c-d299462d15a1

5 files changed, 18 insertions, 18 deletions

diff --git a/src/plugin.c b/src/plugin.c
index ed80ff1..7802fdd 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -189,7 +189,7 @@ slv2_plugin_load(SLV2Plugin p)
 	
 	// Load ports
 	query = (const unsigned char*)
-		"PREFIX : <http://lv2plug.in/ontology#>\n"
+		"PREFIX : <http://lv2plug.in/ns/lv2core#>\n"
 		"SELECT DISTINCT ?port ?symbol ?index WHERE {\n"
 		"<>    :port   ?port .\n"
 		"?port :symbol ?symbol ;\n"
@@ -302,7 +302,7 @@ slv2_plugin_verify(SLV2Plugin plugin)
 		librdf_node* license_node = librdf_query_results_get_binding_value(results, 2);
 		librdf_node* port_node = librdf_query_results_get_binding_value(results, 3);
 
-		if (!strcmp(type_str, "http://lv2plug.in/ontology#Plugin"))
+		if (!strcmp(type_str, "http://lv2plug.in/ns/lv2core#Plugin"))
 			has_type = true;
 		
 		if (name_node)
diff --git a/src/plugins.c b/src/plugins.c
index 5c2e7ae..d524122 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -117,7 +117,7 @@ slv2_plugins_load_bundle(SLV2Plugins list,
 	
 	/* Get all plugins explicitly mentioned in the manifest (discovery pass 1) */
 	char* query_string =
-    	"PREFIX : <http://lv2plug.in/ontology#>\n\n"
+    	"PREFIX : <http://lv2plug.in/ns/lv2core#>\n\n"
 		"SELECT DISTINCT ?plugin_uri FROM <>\n"
 		"WHERE { ?plugin_uri a :Plugin }\n";
 	
@@ -157,7 +157,7 @@ slv2_plugins_load_bundle(SLV2Plugins list,
 	/* Get all data files linked to plugins (discovery pass 2) */
 	query_string =
 		"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"
-    	"PREFIX :     <http://lv2plug.in/ontology#>\n\n"
+    	"PREFIX :     <http://lv2plug.in/ns/lv2core#>\n\n"
     	"SELECT DISTINCT ?subject ?data_uri ?binary FROM <>\n"
     	"WHERE { ?subject  rdfs:seeAlso  ?data_uri\n"
 		"OPTIONAL { ?subject :binary ?binary } }\n";
diff --git a/src/port.c b/src/port.c
index 08f9046..c1acf5e 100644
--- a/src/port.c
+++ b/src/port.c
@@ -78,9 +78,9 @@ slv2_port_get_direction(SLV2Plugin p,
 		SLV2Value val = slv2_values_get_at(direction, i);
 		if (slv2_value_is_uri(val)) {
 			const char* uri = slv2_value_as_uri(val);
-			if (!strcmp(uri, "http://lv2plug.in/ontology#InputPort"))
+			if (!strcmp(uri, "http://lv2plug.in/ns/lv2core#InputPort"))
 				ret = SLV2_PORT_DIRECTION_INPUT;
-			else if (!strcmp(uri, "http://lv2plug.in/ontology#OutputPort"))
+			else if (!strcmp(uri, "http://lv2plug.in/ns/lv2core#OutputPort"))
 				ret = SLV2_PORT_DIRECTION_OUTPUT;
 		}
 	}
@@ -106,9 +106,9 @@ slv2_port_get_type(SLV2Plugin p,
 		SLV2Value val = slv2_values_get_at(type, i);
 		if (slv2_value_is_uri(val)) {
 			const char* uri = slv2_value_as_uri(val);
-			if (!strcmp(uri, "http://lv2plug.in/ontology#ControlPort"))
+			if (!strcmp(uri, "http://lv2plug.in/ns/lv2core#ControlPort"))
 				ret = SLV2_PORT_TYPE_CONTROL;
-			else if (!strcmp(uri, "http://lv2plug.in/ontology#AudioPort"))
+			else if (!strcmp(uri, "http://lv2plug.in/ns/lv2core#AudioPort"))
 				ret = SLV2_PORT_TYPE_AUDIO;
 			else if (!strcmp(uri, "http://ll-plugins.nongnu.org/lv2/ext/MidiPort"))
 				ret = SLV2_PORT_TYPE_MIDI;
@@ -139,10 +139,10 @@ slv2_port_has_hint(SLV2Plugin p,
 		const SLV2Value val = slv2_values_get_at(type, i);
 		if (slv2_value_is_uri(val)) {
 			const char* uri = slv2_value_as_uri(val);
-			if (!strcmp(uri, "http://lv2plug.in/ontology#connectionOptional"))
+			if (!strcmp(uri, "http://lv2plug.in/ns/lv2core#connectionOptional"))
 				return true;
 				ret = SLV2_PORT_TYPE_CONTROL;
-			else if (!strcmp(uri, "http://lv2plug.in/ontology#AudioPort"))
+			else if (!strcmp(uri, "http://lv2plug.in/ns/lv2core#AudioPort"))
 				ret = SLV2_PORT_TYPE_AUDIO;
 			else if (!strcmp(uri, "http://ll-plugins.nongnu.org/lv2/ext/MidiPort"))
 				ret = SLV2_PORT_TYPE_MIDI;
diff --git a/src/query.c b/src/query.c
index d7f583f..f11d1d3 100644
--- a/src/query.c
+++ b/src/query.c
@@ -32,7 +32,7 @@ static const char* slv2_query_prefixes =
 	"PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
 	"PREFIX rdfs:   <http://www.w3.org/2000/01/rdf-schema#>\n"
 	"PREFIX doap:   <http://usefulinc.com/ns/doap#>\n"
-	"PREFIX lv2:    <http://lv2plug.in/ontology#>\n";
+	"PREFIX lv2:    <http://lv2plug.in/ns/lv2core#>\n";
 
 #if 0
 char*
diff --git a/src/world.c b/src/world.c
index 1458124..ccd0c6c 100644
--- a/src/world.c
+++ b/src/world.c
@@ -56,14 +56,14 @@ slv2_world_new()
 	world->plugin_classes = slv2_plugin_classes_new();
 	
 	// Add the ever-present lv2:Plugin to classes
-	static const char* lv2_plugin_uri = "http://lv2plug.in/ontology#Plugin";
+	static const char* lv2_plugin_uri = "http://lv2plug.in/ns/lv2core#Plugin";
 	raptor_sequence_push(world->plugin_classes, slv2_plugin_class_new(
 				world, NULL, lv2_plugin_uri, "Plugin"));
 	
 	world->plugins = slv2_plugins_new();
 	
 	world->lv2_plugin_node = librdf_new_node_from_uri_string(world->world,
-			(unsigned char*)"http://lv2plug.in/ontology#Plugin");
+			(unsigned char*)"http://lv2plug.in/ns/lv2core#Plugin");
 	
 	world->rdf_a_node = librdf_new_node_from_uri_string(world->world,
 			(unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
@@ -99,14 +99,14 @@ slv2_world_new_using_rdf_world(librdf_world* rdf_world)
 	world->plugin_classes = slv2_plugin_classes_new();
 	
 	// Add the ever-present lv2:Plugin to classes
-	static const char* lv2_plugin_uri = "http://lv2plug.in/ontology#Plugin";
+	static const char* lv2_plugin_uri = "http://lv2plug.in/ns/lv2core#Plugin";
 	raptor_sequence_push(world->plugin_classes, slv2_plugin_class_new(
 				world, NULL, lv2_plugin_uri, "Plugin"));
 	
 	world->plugins = slv2_plugins_new();
 	
 	world->lv2_plugin_node = librdf_new_node_from_uri_string(rdf_world,
-			(unsigned char*)"http://lv2plug.in/ontology#Plugin");
+			(unsigned char*)"http://lv2plug.in/ns/lv2core#Plugin");
 	
 	world->rdf_a_node = librdf_new_node_from_uri_string(rdf_world,
 			(unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
@@ -289,7 +289,7 @@ slv2_world_load_plugin_classes(SLV2World world)
 	// FIXME: This loads things that aren't plugin categories
 	
 	unsigned char* query_string = (unsigned char*)
-    	"PREFIX : <http://lv2plug.in/ontology#>\n"
+    	"PREFIX : <http://lv2plug.in/ns/lv2core#>\n"
 		"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"
 		"SELECT DISTINCT ?class ?parent ?label WHERE {\n"
 		//"	?plugin a :Plugin; a ?class .\n"
@@ -377,7 +377,7 @@ slv2_world_load_all(SLV2World world)
 
 	// Find all plugins and associated data files
 	unsigned char* query_string = (unsigned char*)
-    	"PREFIX : <http://lv2plug.in/ontology#>\n"
+    	"PREFIX : <http://lv2plug.in/ns/lv2core#>\n"
 		"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"
 		"PREFIX slv2: <http://drobilla.net/ns/slv2#>\n"
 		"SELECT DISTINCT ?plugin ?data ?bundle ?binary\n"
@@ -439,7 +439,7 @@ void
 slv2_world_serialize(const char* filename)
 {
 	librdf_uri* lv2_uri = librdf_new_uri(slv2_rdf_world,
-			(unsigned char*)"http://lv2plug.in/ontology#");
+			(unsigned char*)"http://lv2plug.in/ns/lv2core#");
 	
 	librdf_uri* rdfs_uri = librdf_new_uri(slv2_rdf_world,
 			(unsigned char*)"http://www.w3.org/2000/01/rdf-schema#");