diff options
-rw-r--r-- | data/lv2.ttl | 25 | ||||
-rw-r--r-- | slv2/world.h | 2 | ||||
-rw-r--r-- | src/plugin.c | 4 | ||||
-rw-r--r-- | src/plugins.c | 4 | ||||
-rw-r--r-- | src/port.c | 12 | ||||
-rw-r--r-- | src/query.c | 2 | ||||
-rw-r--r-- | src/world.c | 14 | ||||
-rw-r--r-- | utils/ladspa2lv2.c | 4 |
8 files changed, 35 insertions, 32 deletions
diff --git a/data/lv2.ttl b/data/lv2.ttl index ec189bf..38888bd 100644 --- a/data/lv2.ttl +++ b/data/lv2.ttl @@ -1,5 +1,5 @@ # RDF Schema for LV2 plugins -# *** PROVISIONAL Revision 2007-05-08 *** +# *** PROVISIONAL Revision 2007-07-23 *** # # This document describes the classes and properties that are defined by the # core LV2 specification. See <http://lv2plug.in> for more information. @@ -24,14 +24,24 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -@prefix : <http://lv2plug.in/ontology#> . +@prefix : <http://lv2plug.in/ns/lv2core#> . @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . @prefix xsd: <http://www.w3.org/2001/XMLSchema> . @prefix doap: <http://usefulinc.com/ns/doap#> . @prefix foaf: <http://xmlns.com/foaf/0.1/> . +:Specification a rdfs:Class ; + rdfs:comment """ +A part of the system LV2 specification. This file defines the core of the LV2 +specification, but extensions can be written which add to it. Specification +data is distributed in bundles so hosts may discover all present extensions +and treat them as a single extended "LV2 Specification". +See http://lv2plug.in/docs for more details. +""" . + <> a doap:Project ; + a :Specification ; doap:license <http://usefulinc.com/doap/licenses/mit> ; doap:name "LV2" ; doap:homepage <http://lv2plug.in> ; @@ -39,8 +49,8 @@ doap:shortdesc "An audio processing plugin specification" ; doap:programming-language "C" ; doap:release [ - doap:revision "1.0beta3" ; - doap:created "2007-05-08" + doap:revision "1.0beta4" ; + doap:created "2007-07-23" ] ; doap:maintainer [ a foaf:Person ; @@ -54,13 +64,6 @@ rdfs:seeAlso <http://drobilla.net/drobilla.xrdf> ]. -:Extension a rdfs:Class ; - rdfs:command """ -An extension to the LV2 specification. Extension data should be installed in -bundles, and data associated with an extension should be used by the host as -if it were included directly in lv2.ttl (this file). -""" . - ################## ## Plugin Class ## diff --git a/slv2/world.h b/slv2/world.h index 527acbe..e4e135d 100644 --- a/slv2/world.h +++ b/slv2/world.h @@ -186,7 +186,7 @@ slv2_world_get_plugins_by_class(SLV2World world, * * \b Example: Get all plugins with at least 1 audio input and output: <tt> \verbatim -PREFIX : <http://lv2plug.in/ontology#> +PREFIX : <http://lv2plug.in/ns/lv2core#> SELECT DISTINCT ?plugin WHERE { ?plugin :port [ a :AudioPort; a :InputPort ] ; :port [ a :AudioPort; a :OutputPort ] . 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"; @@ -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#"); diff --git a/utils/ladspa2lv2.c b/utils/ladspa2lv2.c index b68185e..d4bf827 100644 --- a/utils/ladspa2lv2.c +++ b/utils/ladspa2lv2.c @@ -29,7 +29,7 @@ #define U(x) ((const unsigned char*)(x)) #define NS_RDF(x) "http://www.w3.org/1999/02/22-rdf-syntax-ns#" x -#define NS_LV2(x) "http://lv2plug.in/ontology#" x +#define NS_LV2(x) "http://lv2plug.in/ns/lv2core#" x #define NS_DOAP(x) "http://usefulinc.com/ns/doap#" x librdf_world* world = NULL; @@ -275,7 +275,7 @@ write_lv2_turtle(LADSPA_Descriptor* descriptor, const char* plugin_uri, const ch librdf_serializer_set_namespace(serializer, librdf_new_uri(world, U("http://xmlns.com/foaf/0.1/")), "foaf"); librdf_serializer_set_namespace(serializer, librdf_new_uri(world, - U("http://lv2plug.in/ontology#")), "lv2"); + U("http://lv2plug.in/ns/lv2core#")), "lv2"); add_resource(model, plugin, NS_RDF("type"), |