Separate URIs from LV2URIMap.

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

1 files changed, 2 insertions, 84 deletions

diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp
index 7019f193..78d22b70 100644
--- a/src/shared/LV2URIMap.cpp
+++ b/src/shared/LV2URIMap.cpp
@@ -37,88 +37,8 @@ using namespace Raul;
 namespace Ingen {
 namespace Shared {
 
-LV2URIMap::Quark::Quark(const char* c_str)
-	: Raul::URI(c_str)
-	, id(g_quark_from_string(c_str))
-{
-}
-
-const char*
-LV2URIMap::Quark::c_str() const
-{
-	return g_quark_to_string(id);
-}
-
-#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/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#"
-
-LV2URIMap::LV2URIMap()
-	: atom_AtomTransfer     (LV2_ATOM_URI "#AtomTransfer")
-	, atom_Bool             (LV2_ATOM_URI "#Bool")
-	, atom_Float32          (LV2_ATOM_URI "#Float32")
-	, atom_Int32            (LV2_ATOM_URI "#Int32")
-	, atom_MessagePort      (LV2_ATOM_URI "#MessagePort")
-	, atom_String           (LV2_ATOM_URI "#String")
-	, atom_ValuePort        (LV2_ATOM_URI "#ValuePort")
-	, atom_Vector           (LV2_ATOM_URI "#Vector")
-	, atom_supports         (LV2_ATOM_URI "#supports")
-	, ctx_AudioContext      (NS_CTX "AudioContext")
-	, ctx_MessageContext    (NS_CTX "MessageContext")
-	, ctx_context           (NS_CTX "context")
-	, doap_name             ("http://usefulinc.com/ns/doap#name")
-	, ev_EventPort          ("http://lv2plug.in/ns/ext/event#EventPort")
-	, ingen_Internal        (NS_INGEN "Internal")
-	, ingen_Node            (NS_INGEN "Node")
-	, ingen_Patch           (NS_INGEN "Patch")
-	, ingen_Port            (NS_INGEN "Port")
-	, ingen_broadcast       (NS_INGEN "broadcast")
-	, ingen_controlBinding  (NS_INGEN "controlBinding")
-	, ingen_document        (NS_INGEN "document")
-	, ingen_enabled         (NS_INGEN "enabled")
-	, ingen_engine          (NS_INGEN "engine")
-	, ingen_nil             (NS_INGEN "nil")
-	, ingen_node            (NS_INGEN "node")
-	, ingen_polyphonic      (NS_INGEN "polyphonic")
-	, ingen_polyphony       (NS_INGEN "polyphony")
-	, ingen_sampleRate      (NS_INGEN "sampleRate")
-	, ingen_selected        (NS_INGEN "selected")
-	, ingen_value           (NS_INGEN "value")
-	, ingenui_canvas_x      (NS_INGENUI "canvas-x")
-	, ingenui_canvas_y      (NS_INGENUI "canvas-y")
-	, lv2_AudioPort         (NS_LV2 "AudioPort")
-	, lv2_ControlPort       (NS_LV2 "ControlPort")
-	, lv2_InputPort         (NS_LV2 "InputPort")
-	, lv2_OutputPort        (NS_LV2 "OutputPort")
-	, lv2_Plugin            (NS_LV2 "Plugin")
-	, lv2_connectionOptional(NS_LV2 "connectionOptional")
-	, lv2_default           (NS_LV2 "default")
-	, lv2_index             (NS_LV2 "index")
-	, lv2_integer           (NS_LV2 "integer")
-	, lv2_maximum           (NS_LV2 "maximum")
-	, lv2_minimum           (NS_LV2 "minimum")
-	, lv2_name              (NS_LV2 "name")
-	, lv2_portProperty      (NS_LV2 "portProperty")
-	, lv2_sampleRate        (NS_LV2 "sampleRate")
-	, lv2_symbol            (NS_LV2 "symbol")
-	, lv2_toggled           (NS_LV2 "toggled")
-	, midi_Bender           (NS_MIDI "Bender")
-	, midi_ChannelPressure  (NS_MIDI "ChannelPressure")
-	, midi_Controller       (NS_MIDI "Controller")
-	, midi_MidiEvent        ("http://lv2plug.in/ns/ext/midi#MidiEvent")
-	, midi_Note             (NS_MIDI "Note")
-	, midi_controllerNumber (NS_MIDI "controllerNumber")
-	, midi_noteNumber       (NS_MIDI "noteNumber")
-	, rdf_instanceOf        (NS_RDF "instanceOf")
-	, rdf_type              (NS_RDF "type")
-	, rdfs_seeAlso          (NS_RDFS "seeAlso")
-	, ui_Events             ("http://lv2plug.in/ns/extensions/ui#Events")
-	, wildcard              (NS_INGEN "wildcard")
+LV2URIMap::LV2URIMap(URIs& uris)
+	: _uris(uris)
 {
 	uri_map_feature_data.uri_to_id = &LV2URIMap::uri_map_uri_to_id;
 	uri_map_feature_data.callback_data = this;
@@ -126,8 +46,6 @@ LV2URIMap::LV2URIMap()
 	uri_map_feature.data = &uri_map_feature_data;
 }
 
-struct null_deleter { void operator()(void const *) const {} };
-
 uint32_t
 LV2URIMap::uri_to_id(const char* map,
                      const char* uri)