1 files changed, 4 insertions, 69 deletions

diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
index 8c126a0e..35baa9f8 100644
--- a/src/shared/LV2URIMap.hpp
+++ b/src/shared/LV2URIMap.hpp
@@ -28,6 +28,7 @@
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
 
 #include "LV2Features.hpp"
+#include "URIs.hpp"
 
 namespace Ingen {
 namespace Shared {
@@ -36,7 +37,7 @@ namespace Shared {
  */
 class LV2URIMap : public boost::noncopyable, public LV2Features::Feature {
 public:
-	LV2URIMap();
+	LV2URIMap(URIs& uris);
 
 	SharedPtr<LV2_Feature> feature(Shared::World*, Node*) {
 		return SharedPtr<LV2_Feature>(&uri_map_feature, NullDeleter<LV2_Feature>);
@@ -56,79 +57,13 @@ private:
 	LV2_Feature         uri_map_feature;
 	LV2_URI_Map_Feature uri_map_feature_data;
 
-typedef std::map<uint16_t, uint32_t> EventToGlobal;
+	typedef std::map<uint16_t, uint32_t> EventToGlobal;
 	typedef std::map<uint32_t, uint16_t> GlobalToEvent;
 
 	EventToGlobal _event_to_global;
 	GlobalToEvent _global_to_event;
 
-public:
-	struct Quark : public Raul::URI {
-		Quark(const char* str);
-		const char* c_str() const;
-		uint32_t id;
-	};
-
-	const Quark atom_AtomTransfer;
-	const Quark atom_Bool;
-	const Quark atom_Float32;
-	const Quark atom_Int32;
-	const Quark atom_MessagePort;
-	const Quark atom_String;
-	const Quark atom_ValuePort;
-	const Quark atom_Vector;
-	const Quark atom_supports;
-	const Quark ctx_AudioContext;
-	const Quark ctx_MessageContext;
-	const Quark ctx_context;
-	const Quark doap_name;
-	const Quark ev_EventPort;
-	const Quark ingen_Internal;
-	const Quark ingen_Node;
-	const Quark ingen_Patch;
-	const Quark ingen_Port;
-	const Quark ingen_broadcast;
-	const Quark ingen_controlBinding;
-	const Quark ingen_document;
-	const Quark ingen_enabled;
-	const Quark ingen_engine;
-	const Quark ingen_nil;
-	const Quark ingen_node;
-	const Quark ingen_polyphonic;
-	const Quark ingen_polyphony;
-	const Quark ingen_sampleRate;
-	const Quark ingen_selected;
-	const Quark ingen_value;
-	const Quark ingenui_canvas_x;
-	const Quark ingenui_canvas_y;
-	const Quark lv2_AudioPort;
-	const Quark lv2_ControlPort;
-	const Quark lv2_InputPort;
-	const Quark lv2_OutputPort;
-	const Quark lv2_Plugin;
-	const Quark lv2_connectionOptional;
-	const Quark lv2_default;
-	const Quark lv2_index;
-	const Quark lv2_integer;
-	const Quark lv2_maximum;
-	const Quark lv2_minimum;
-	const Quark lv2_name;
-	const Quark lv2_portProperty;
-	const Quark lv2_sampleRate;
-	const Quark lv2_symbol;
-	const Quark lv2_toggled;
-	const Quark midi_Bender;
-	const Quark midi_ChannelPressure;
-	const Quark midi_Controller;
-	const Quark midi_MidiEvent;
-	const Quark midi_Note;
-	const Quark midi_controllerNumber;
-	const Quark midi_noteNumber;
-	const Quark rdf_instanceOf;
-	const Quark rdf_type;
-	const Quark rdfs_seeAlso;
-	const Quark ui_Events;
-	const Quark wildcard;
+	URIs& _uris;
 };
 
 } // namespace Shared