From fecf51ec1c982a7c15dc895122b36c36d9d8eb8a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 22 Sep 2010 19:21:26 +0000 Subject: Move http://lv2plug.in/ns/dev extensions to http://lv2plug.in/ns/ext. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2614 a436a847-0d15-0410-975c-d299462d15a1 --- ingen.ttl | 4 ++-- patches/dist_oct.ingen.ttl | 2 +- src/common/contexts.lv2 | 2 +- src/common/interface/PortType.hpp | 4 ++-- src/common/resize-port.lv2 | 2 +- src/common/string-port.lv2 | 2 +- src/engine/LV2Node.cpp | 6 +++--- src/gui/NodeMenu.cpp | 4 ++-- src/module/World.cpp | 6 +++--- src/shared/LV2URIMap.cpp | 14 +++++++------- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ingen.ttl b/ingen.ttl index 1a1ae90c..9a21d8df 100644 --- a/ingen.ttl +++ b/ingen.ttl @@ -2,7 +2,7 @@ @prefix rdf: . @prefix rdfs: . @prefix foaf: . -@prefix hi: . +@prefix hi: . a doap:Project, hi:Host ; doap:name "Ingen" ; @@ -28,7 +28,7 @@ ] , [ hi:extension ; ] , [ - hi:extension ; + hi:extension ; ] , [ hi:extension ; ] ; diff --git a/patches/dist_oct.ingen.ttl b/patches/dist_oct.ingen.ttl index 5f4078ff..2b667df9 100644 --- a/patches/dist_oct.ingen.ttl +++ b/patches/dist_oct.ingen.ttl @@ -10,7 +10,7 @@ @prefix xsd: . - ingen:plugin ; + ingen:plugin ; ingen:polyphonic true ; ingen:port , , , , , , , , , , ; lv2var:variable [ diff --git a/src/common/contexts.lv2 b/src/common/contexts.lv2 index acc4d68c..2893b17b 120000 --- a/src/common/contexts.lv2 +++ b/src/common/contexts.lv2 @@ -1 +1 @@ -../../../lv2/dev/contexts.lv2 \ No newline at end of file +../../../lv2/ext/contexts.lv2 \ No newline at end of file diff --git a/src/common/interface/PortType.hpp b/src/common/interface/PortType.hpp index 4813f0ee..89cb1e91 100644 --- a/src/common/interface/PortType.hpp +++ b/src/common/interface/PortType.hpp @@ -84,8 +84,8 @@ private: "http://lv2plug.in/ns/lv2core#AudioPort", "http://lv2plug.in/ns/lv2core#ControlPort", "http://lv2plug.in/ns/ext/event#EventPort", - "http://lv2plug.in/ns/dev/objects#ValuePort", - "http://lv2plug.in/ns/dev/objects#MessagePort" + "http://lv2plug.in/ns/ext/objects#ValuePort", + "http://lv2plug.in/ns/ext/objects#MessagePort" }; return uris[symbol_num]; } diff --git a/src/common/resize-port.lv2 b/src/common/resize-port.lv2 index 89bdbf96..e43b9525 120000 --- a/src/common/resize-port.lv2 +++ b/src/common/resize-port.lv2 @@ -1 +1 @@ -../../../lv2/dev/resize-port.lv2 \ No newline at end of file +../../../lv2/ext/resize-port.lv2 \ No newline at end of file diff --git a/src/common/string-port.lv2 b/src/common/string-port.lv2 index 3615878f..03e5a56a 120000 --- a/src/common/string-port.lv2 +++ b/src/common/string-port.lv2 @@ -1 +1 @@ -../../../lv2/dev/string-port.lv2 \ No newline at end of file +../../../lv2/ext/string-port.lv2 \ No newline at end of file diff --git a/src/engine/LV2Node.cpp b/src/engine/LV2Node.cpp index 8d95b641..84835f10 100644 --- a/src/engine/LV2Node.cpp +++ b/src/engine/LV2Node.cpp @@ -190,13 +190,13 @@ LV2Node::instantiate(BufferFactory& bufs) slv2_plugin_get_port_ranges_float(plug, min_values, max_values, def_values); SLV2Value context_pred = slv2_value_new_uri(info->lv2_world(), - "http://lv2plug.in/ns/dev/contexts#context"); + "http://lv2plug.in/ns/ext/contexts#context"); SLV2Value default_pred = slv2_value_new_uri(info->lv2_world(), "http://lv2plug.in/ns/lv2core#default"); SLV2Value min_size_pred = slv2_value_new_uri(info->lv2_world(), - "http://lv2plug.in/ns/dev/resize-port#minimumSize"); + "http://lv2plug.in/ns/ext/resize-port#minimumSize"); SLV2Value port_property_pred = slv2_value_new_uri(info->lv2_world(), "http://lv2plug.in/ns/lv2core#portProperty"); @@ -205,7 +205,7 @@ LV2Node::instantiate(BufferFactory& bufs) LV2_ATOM_URI "#supports"); //SLV2Value as_large_as_pred = slv2_value_new_uri(info->lv2_world(), - // "http://lv2plug.in/ns/dev/resize-port#asLargeAs"); + // "http://lv2plug.in/ns/ext/resize-port#asLargeAs"); for (uint32_t j = 0; j < num_ports; ++j) { SLV2Port id = slv2_plugin_get_port_by_index(plug, j); diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 095ec1dd..212ea80f 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -89,7 +89,7 @@ NodeMenu::init(SharedPtr node) #ifdef HAVE_SLV2 if (plugin && plugin->type() == PluginModel::LV2) { SLV2Results presets = slv2_plugin_query_sparql(plugin->slv2_plugin(), - "PREFIX pset: \n" + "PREFIX pset: \n" "PREFIX dc: \n" "SELECT ?p ?name WHERE { <> pset:hasPreset ?p . ?p dc:title ?name }\n"); if (!slv2_results_finished(presets)) { @@ -176,7 +176,7 @@ NodeMenu::on_preset_activated(const std::string& uri) const NodeModel* const node = (NodeModel*)_object.get(); const PluginModel* const plugin = dynamic_cast(node->plugin()); const string query = string( - "PREFIX pset: \n" + "PREFIX pset: \n" "PREFIX dc: \n" "SELECT ?sym ?val WHERE { <") + uri + "> lv2:port ?port . " " ?port lv2:symbol ?sym ; pset:value ?val . }"; diff --git a/src/module/World.cpp b/src/module/World.cpp index 18a50705..2296d928 100644 --- a/src/module/World.cpp +++ b/src/module/World.cpp @@ -121,12 +121,12 @@ struct WorldImpl : public boost::noncopyable { rdf_world->add_prefix("ingenui", "http://drobilla.net/ns/ingenuity#"); rdf_world->add_prefix("lv2", "http://lv2plug.in/ns/lv2core#"); rdf_world->add_prefix("lv2ev", "http://lv2plug.in/ns/ext/event#"); - rdf_world->add_prefix("ctx", "http://lv2plug.in/ns/dev/contexts#"); + rdf_world->add_prefix("ctx", "http://lv2plug.in/ns/ext/contexts#"); rdf_world->add_prefix("lv2midi", "http://lv2plug.in/ns/ext/midi#"); - rdf_world->add_prefix("midi", "http://drobilla.net/ns/dev/midi#"); + rdf_world->add_prefix("midi", "http://drobilla.net/ns/ext/midi#"); rdf_world->add_prefix("owl", "http://www.w3.org/2002/07/owl#"); rdf_world->add_prefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#"); - rdf_world->add_prefix("sp", "http://lv2plug.in/ns/dev/string-port#"); + rdf_world->add_prefix("sp", "http://lv2plug.in/ns/ext/string-port#"); rdf_world->add_prefix("xsd", "http://www.w3.org/2001/XMLSchema#"); } diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp index d1bbae22..9f52a61d 100644 --- a/src/shared/LV2URIMap.cpp +++ b/src/shared/LV2URIMap.cpp @@ -43,12 +43,12 @@ LV2URIMap::Quark::c_str() const return g_quark_to_string(id); } -#define NS_CTX "http://lv2plug.in/ns/dev/contexts#" +#define NS_CTX "http://lv2plug.in/ns/ext/contexts#" #define NS_INGEN "http://drobilla.net/ns/ingen#" #define NS_INGENUI "http://drobilla.net/ns/ingenuity#" #define NS_LV2 "http://lv2plug.in/ns/lv2core#" -#define NS_MIDI "http://drobilla.net/ns/dev/midi#" -#define NS_MIDI "http://drobilla.net/ns/dev/midi#" +#define NS_MIDI "http://drobilla.net/ns/ext/midi#" +#define NS_MIDI "http://drobilla.net/ns/ext/midi#" #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" #define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#" @@ -96,9 +96,9 @@ LV2URIMap::LV2URIMap() , midi_controllerNumber(NS_MIDI "controllerNumber") , midi_event("http://lv2plug.in/ns/ext/midi#MidiEvent") , midi_noteNumber(NS_MIDI "noteNumber") - , obj_MessagePort("http://lv2plug.in/ns/dev/objects#MessagePort") - , obj_ValuePort("http://lv2plug.in/ns/dev/objects#ValuePort") - , obj_supports("http://lv2plug.in/ns/dev/objects#supports") + , obj_MessagePort("http://lv2plug.in/ns/ext/objects#MessagePort") + , obj_ValuePort("http://lv2plug.in/ns/ext/objects#ValuePort") + , obj_supports("http://lv2plug.in/ns/ext/objects#supports") , object_class_bool(LV2_ATOM_URI "#Bool") , object_class_float32(LV2_ATOM_URI "#Float32") , object_class_int32(LV2_ATOM_URI "#Int32") @@ -108,7 +108,7 @@ LV2URIMap::LV2URIMap() , rdf_instanceOf(NS_RDF "instanceOf") , rdf_type(NS_RDF "type") , rdfs_seeAlso(NS_RDFS "seeAlso") - , string_transfer("http://lv2plug.in/ns/dev/string-port#StringTransfer") + , string_transfer("http://lv2plug.in/ns/ext/string-port#StringTransfer") , ui_format_events("http://lv2plug.in/ns/extensions/ui#Events") , wildcard(NS_INGEN "wildcard") { -- cgit v1.2.1