Separate URIs from LV2URIMap.

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

30 files changed, 61 insertions, 54 deletions

diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index 54886e35..e2945d6f 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -33,8 +33,8 @@ namespace Server {
 
 static const size_t EVENT_BYTES_PER_FRAME = 4; // FIXME
 
-BufferFactory::BufferFactory(Engine&                             engine,
-                             SharedPtr<Ingen::Shared::LV2URIMap> uris)
+BufferFactory::BufferFactory(Engine&                        engine,
+                             SharedPtr<Ingen::Shared::URIs> uris)
 	: _engine(engine)
 	, _uris(uris)
 	, _silent_buffer(NULL)
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 3fe46c35..b19f67b4 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -32,7 +32,7 @@
 
 namespace Ingen {
 
-namespace Shared { class LV2URIMap; }
+namespace Shared { class URIs; }
 
 namespace Server {
 
@@ -41,8 +41,8 @@ class Buffer;
 
 class BufferFactory {
 public:
-	BufferFactory(Engine&                             engine,
-	              SharedPtr<Ingen::Shared::LV2URIMap> uris);
+	BufferFactory(Engine&                        engine,
+	              SharedPtr<Ingen::Shared::URIs> uris);
 
 	~BufferFactory();
 
@@ -57,7 +57,7 @@ public:
 
 	void set_block_length(SampleCount block_length);
 
-	Ingen::Shared::LV2URIMap& uris() { assert(_uris); return *_uris.get(); }
+	Ingen::Shared::URIs& uris() { assert(_uris); return *_uris.get(); }
 
 private:
 	friend class Buffer;
@@ -83,9 +83,9 @@ private:
 	Raul::AtomicPtr<Buffer> _free_event;
 	Raul::AtomicPtr<Buffer> _free_object;
 
-	Glib::Mutex                         _mutex;
-	Engine&                             _engine;
-	SharedPtr<Ingen::Shared::LV2URIMap> _uris;
+	Glib::Mutex                    _mutex;
+	Engine&                        _engine;
+	SharedPtr<Ingen::Shared::URIs> _uris;
 
 	Ref _silent_buffer;
 };
diff --git a/src/server/ConnectionImpl.cpp b/src/server/ConnectionImpl.cpp
index 640b61b0..13ebff8f 100644
--- a/src/server/ConnectionImpl.cpp
+++ b/src/server/ConnectionImpl.cpp
@@ -157,7 +157,7 @@ ConnectionImpl::must_queue() const
 bool
 ConnectionImpl::can_connect(const OutputPort* src, const InputPort* dst)
 {
-	const Ingen::Shared::LV2URIMap& uris = src->bufs().uris();
+	const Ingen::Shared::URIs& uris = src->bufs().uris();
 	return (
 			// (Audio | Control) => (Audio | Control)
 			(   (src->is_a(PortType::CONTROL) || src->is_a(PortType::AUDIO))
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 77c1fdf7..1b5459fa 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -18,6 +18,7 @@
 #include <math.h>
 #include "raul/log.hpp"
 #include "raul/midi_events.h"
+#include "shared/URIs.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "ingen/shared/World.hpp"
 
@@ -55,7 +56,7 @@ ControlBindings::Key
 ControlBindings::port_binding(PortImpl* port) const
 {
 	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
 	const Raul::Atom& binding = port->get_property(uris.ingen_controlBinding);
 	return binding_key(binding);
 }
@@ -63,7 +64,7 @@ ControlBindings::port_binding(PortImpl* port) const
 ControlBindings::Key
 ControlBindings::binding_key(const Raul::Atom& binding) const
 {
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
 	Key key;
 	if (binding.type() == Atom::DICT) {
 		const Atom::DictValue&          dict = binding.get_dict();
@@ -124,7 +125,9 @@ ControlBindings::port_value_changed(ProcessContext&   context,
                                     Key               key,
                                     const Raul::Atom& value_atom)
 {
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	Ingen::Shared::World*           world   = context.engine().world();
+	const Ingen::Shared::URIs&      uris    = *world->uris().get();
+	const Ingen::Shared::LV2URIMap& uri_map = *world->lv2_uri_map().get();
 	if (key) {
 		int16_t value = port_value_to_control(
 			port, key.type, value_atom, port->minimum(), port->maximum());
@@ -162,7 +165,7 @@ ControlBindings::port_value_changed(ProcessContext&   context,
 		}
 		if (size > 0) {
 			_feedback->append(0, 0,
-			                  uris.global_to_event(uris.midi_MidiEvent.id).second,
+			                  uri_map.global_to_event(uris.midi_MidiEvent.id).second,
 			                  size, buf);
 		}
 	}
@@ -274,7 +277,7 @@ ControlBindings::set_port_value(ProcessContext& context,
 bool
 ControlBindings::bind(ProcessContext& context, Key key)
 {
-	const Ingen::Shared::LV2URIMap& uris = *context.engine().world()->uris().get();
+	const Ingen::Shared::URIs& uris = *context.engine().world()->uris().get();
 	assert(_learn_port);
 	if (key.type == MIDI_NOTE) {
 		bool toggled = _learn_port->has_property(uris.lv2_portProperty, uris.lv2_toggled);
@@ -349,10 +352,13 @@ ControlBindings::pre_process(ProcessContext& context, EventBuffer* buffer)
 	SharedPtr<Bindings> bindings = _bindings;
 	_feedback->clear();
 
-	const Ingen::Shared::LV2URIMap& uris = *context.engine().world()->uris().get();
+	Ingen::Shared::World*           world   = context.engine().world();
+	const Ingen::Shared::URIs&      uris    = *world->uris().get();
+	const Ingen::Shared::LV2URIMap& uri_map = *world->lv2_uri_map().get();
 
 	// TODO: cache
-	const uint32_t midi_event_type = uris.global_to_event(uris.midi_MidiEvent.id).second;
+	const uint32_t midi_event_type = uri_map.global_to_event(
+		uris.midi_MidiEvent.id).second;
 
 	// Learn from input if necessary
 	if (_learn_port) {
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index bf5946ce..3caa4b6f 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -152,7 +152,7 @@ Engine::activate()
 
 	_message_context->Thread::start();
 
-	const Ingen::Shared::LV2URIMap& uris = *world()->uris().get();
+	const Ingen::Shared::URIs& uris = *world()->uris().get();
 
 	// Create root patch
 	PatchImpl* root_patch = _driver->root_patch();
diff --git a/src/server/GraphObjectImpl.cpp b/src/server/GraphObjectImpl.cpp
index 88edfb0e..e5a1739b 100644
--- a/src/server/GraphObjectImpl.cpp
+++ b/src/server/GraphObjectImpl.cpp
@@ -28,7 +28,7 @@ using namespace Raul;
 namespace Ingen {
 namespace Server {
 
-GraphObjectImpl::GraphObjectImpl(Ingen::Shared::LV2URIMap& uris,
+GraphObjectImpl::GraphObjectImpl(Ingen::Shared::URIs& uris,
                                  GraphObjectImpl*          parent,
                                  const Symbol&             symbol)
 	: ResourceImpl(uris, parent ? parent->path().child(symbol) : Raul::Path::root())
diff --git a/src/server/GraphObjectImpl.hpp b/src/server/GraphObjectImpl.hpp
index 09988214..a9abf26a 100644
--- a/src/server/GraphObjectImpl.hpp
+++ b/src/server/GraphObjectImpl.hpp
@@ -32,7 +32,7 @@ namespace Raul { class Maid; }
 
 namespace Ingen {
 
-namespace Shared { class LV2URIMap; }
+namespace Shared { class URIs; }
 
 namespace Server {
 
@@ -95,7 +95,7 @@ public:
 	virtual bool apply_poly(Raul::Maid& maid, uint32_t poly) = 0;
 
 protected:
-	GraphObjectImpl(Ingen::Shared::LV2URIMap& uris,
+	GraphObjectImpl(Ingen::Shared::URIs& uris,
 	                GraphObjectImpl*          parent,
 	                const Raul::Symbol&       symbol);
 
diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp
index 0a58c017..42a6e167 100644
--- a/src/server/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -50,7 +50,7 @@ InputPort::InputPort(BufferFactory&      bufs,
 	: PortImpl(bufs, parent, symbol, index, poly, type, value, buffer_size)
 	, _num_connections(0)
 {
-	const Ingen::Shared::LV2URIMap& uris = bufs.uris();
+	const Ingen::Shared::URIs& uris = bufs.uris();
 
 	if (!dynamic_cast<Patch*>(parent))
 		add_property(uris.rdf_type, uris.lv2_InputPort);
diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp
index bcf30a47..73dcf2f5 100644
--- a/src/server/InternalPlugin.cpp
+++ b/src/server/InternalPlugin.cpp
@@ -34,7 +34,7 @@ namespace Server {
 
 using namespace Internals;
 
-InternalPlugin::InternalPlugin(Shared::LV2URIMap& uris,
+InternalPlugin::InternalPlugin(Shared::URIs& uris,
 		const std::string& uri, const std::string& symbol)
 	: PluginImpl(uris, Plugin::Internal, uri)
 	, _symbol(symbol)
diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp
index 1b0de55b..528fbc59 100644
--- a/src/server/InternalPlugin.hpp
+++ b/src/server/InternalPlugin.hpp
@@ -39,7 +39,7 @@ class BufferFactory;
 class InternalPlugin : public PluginImpl
 {
 public:
-	InternalPlugin(Shared::LV2URIMap& uris,
+	InternalPlugin(Shared::URIs& uris,
 			const std::string& uri, const std::string& symbol);
 
 	NodeImpl* instantiate(BufferFactory&     bufs,
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 7a36bf1e..b6b21d15 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -195,7 +195,7 @@ JackDriver::JackDriver(Engine& engine)
 	, _process_context(engine)
 	, _root_patch(NULL)
 {
-	_midi_event_type = _engine.world()->uris()->uri_to_id(
+	_midi_event_type = _engine.world()->lv2_uri_map()->uri_to_id(
 			LV2_EVENT_URI, "http://lv2plug.in/ns/ext/midi#MidiEvent");
 }
 
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index 76837c88..fbb7e2ee 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -138,7 +138,7 @@ LV2Node::apply_poly(Raul::Maid& maid, uint32_t poly)
 bool
 LV2Node::instantiate(BufferFactory& bufs)
 {
-	const Ingen::Shared::LV2URIMap& uris = bufs.uris();
+	const Ingen::Shared::URIs& uris = bufs.uris();
 	SharedPtr<LV2Info>              info = _lv2_plugin->lv2_info();
 	const LilvPlugin*               plug = _lv2_plugin->lilv_plugin();
 
diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp
index cb1e1ec3..aa6d9158 100644
--- a/src/server/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -100,7 +100,7 @@ NodeFactory::load_plugins()
 void
 NodeFactory::load_internal_plugins()
 {
-	Ingen::Shared::LV2URIMap& uris = *_world->uris().get();
+	Ingen::Shared::URIs& uris = *_world->uris().get();
 	InternalPlugin* controller_plug = ControllerNode::internal_plugin(uris);
 	_plugins.insert(make_pair(controller_plug->uri(), controller_plug));
 
diff --git a/src/server/Notification.cpp b/src/server/Notification.cpp
index 0808c00e..7cc28cc7 100644
--- a/src/server/Notification.cpp
+++ b/src/server/Notification.cpp
@@ -38,7 +38,7 @@ Notification::post_process(Notification& note,
 		engine.broadcaster()->activity(note.port->path(), note.value);
 		break;
 	case PORT_BINDING: {
-		const Ingen::Shared::LV2URIMap& uris = *engine.world()->uris().get();
+		const Ingen::Shared::URIs& uris = *engine.world()->uris().get();
 		Raul::Atom::DictValue dict;
 		switch (note.binding_type) {
 		case ControlBindings::MIDI_CC:
diff --git a/src/server/PatchPlugin.hpp b/src/server/PatchPlugin.hpp
index 3504730f..e969a4b0 100644
--- a/src/server/PatchPlugin.hpp
+++ b/src/server/PatchPlugin.hpp
@@ -34,7 +34,7 @@ class PatchPlugin : public PluginImpl
 {
 public:
 	PatchPlugin(
-			Shared::LV2URIMap& uris,
+			Shared::URIs& uris,
 			const std::string& uri,
 			const std::string& symbol,
 			const std::string& name)
diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp
index cea1145d..ac551cef 100644
--- a/src/server/PluginImpl.hpp
+++ b/src/server/PluginImpl.hpp
@@ -29,7 +29,7 @@
 
 namespace Ingen {
 
-namespace Shared { class LV2URIMap; }
+namespace Shared { class URIs; }
 
 namespace Server {
 
@@ -47,7 +47,7 @@ class PluginImpl : public Plugin
                  , public boost::noncopyable
 {
 public:
-	PluginImpl(Ingen::Shared::LV2URIMap& uris,
+	PluginImpl(Ingen::Shared::URIs& uris,
 	           Type                      type,
 	           const std::string&        uri,
 	           const std::string         library_path = "")
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 90bf8e0b..456634a0 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -70,7 +70,7 @@ PortImpl::PortImpl(BufferFactory&      bufs,
 	if (_buffer_size == 0)
 		_buffer_size = bufs.default_buffer_size(type);
 
-	const Ingen::Shared::LV2URIMap& uris = bufs.uris();
+	const Ingen::Shared::URIs& uris = bufs.uris();
 	add_property(uris.rdf_type,  type.uri());
 	set_property(uris.lv2_index, Atom((int32_t)index));
 	set_context(_context);
@@ -239,7 +239,7 @@ PortImpl::broadcast_value(Context& context, bool force)
 void
 PortImpl::set_context(Context::ID c)
 {
-	const Ingen::Shared::LV2URIMap& uris = _bufs.uris();
+	const Ingen::Shared::URIs& uris = _bufs.uris();
 	_context = c;
 	switch (c) {
 	case Context::AUDIO:
diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp
index a5c75adf..290ee626 100644
--- a/src/server/events/CreatePatch.cpp
+++ b/src/server/events/CreatePatch.cpp
@@ -80,7 +80,7 @@ CreatePatch::pre_process()
 	if (_parent != NULL && _poly > 1 && _poly == static_cast<int>(_parent->internal_poly()))
 		poly = _poly;
 
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
 
 	_patch = new PatchImpl(_engine, path.symbol(), poly, _parent,
 			_engine.driver()->sample_rate(), _poly);
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 84a8e2d3..28e337e3 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -57,7 +57,7 @@ CreatePort::CreatePort(
 	, _properties(properties)
 	, _is_output(is_output)
 {
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
 
 	typedef Resource::Properties::const_iterator Iterator;
 	typedef std::pair<Iterator, Iterator>        Range;
@@ -97,7 +97,7 @@ CreatePort::pre_process()
 
 	_patch = _engine.engine_store()->find_patch(_path.parent());
 
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
 
 	if (_patch != NULL) {
 		assert(_patch->path() == _path.parent());
diff --git a/src/server/events/RegisterClient.cpp b/src/server/events/RegisterClient.cpp
index 32c1a0c9..7b22bd17 100644
--- a/src/server/events/RegisterClient.cpp
+++ b/src/server/events/RegisterClient.cpp
@@ -57,7 +57,7 @@ RegisterClient::post_process()
 	   kludge.  TODO: keep a proper RDF model to describe the engine and send
 	   that to clients.
 	*/
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
 	_client->set_property(uris.ingen_engine,
 	                      uris.ingen_sampleRate,
 	                      int32_t(_engine.driver()->sample_rate()));
diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp
index 4e40baeb..806d47ef 100644
--- a/src/server/events/SetMetadata.cpp
+++ b/src/server/events/SetMetadata.cpp
@@ -118,7 +118,7 @@ SetMetadata::pre_process()
 		return;
 	}
 
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
 
 	if (is_graph_object && !_object) {
 		Path path(_subject.str());
@@ -274,7 +274,7 @@ SetMetadata::execute(ProcessContext& context)
 		return;
 	}
 
-	const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
 
 	if (_create_event) {
 		_create_event->execute(context);
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index 7c3adb7e..a783e4e9 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -147,7 +147,8 @@ SetPortValue::apply(Context& context)
 			return;
 		}
 
-		Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get();
+		Ingen::Shared::URIs&      uris    = *_engine.world()->uris().get();
+		Ingen::Shared::LV2URIMap& uri_map = *_engine.world()->lv2_uri_map().get();
 
 		EventBuffer* const ebuf = dynamic_cast<EventBuffer*>(buf);
 		if (ebuf && _value.type() == Atom::BLOB) {
@@ -155,7 +156,7 @@ SetPortValue::apply(Context& context)
 
 			// Size 0 event, pass it along to the plugin as a typed but empty event
 			if (_value.data_size() == 0) {
-				const uint32_t type_id = uris.uri_to_id(NULL, _value.get_blob_type());
+				const uint32_t type_id = uri_map.uri_to_id(NULL, _value.get_blob_type());
 				ebuf->append(frames, 0, type_id, 0, NULL);
 				_port->raise_set_by_user_flag();
 				return;
@@ -164,7 +165,7 @@ SetPortValue::apply(Context& context)
 			                   "http://lv2plug.in/ns/ext/midi#MidiEvent")) {
 				ebuf->prepare_write(context);
 				ebuf->append(frames, 0,
-				             uris.global_to_event(uris.midi_MidiEvent.id).second,
+				             uri_map.global_to_event(uris.midi_MidiEvent.id).second,
 				             _value.data_size(),
 				             (const uint8_t*)_value.get_blob());
 				_port->raise_set_by_user_flag();
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index bdf8e607..86a45f03 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -36,7 +36,7 @@ namespace Ingen {
 namespace Server {
 namespace Internals {
 
-InternalPlugin* ControllerNode::internal_plugin(Shared::LV2URIMap& uris) {
+InternalPlugin* ControllerNode::internal_plugin(Shared::URIs& uris) {
 	return new InternalPlugin(uris, NS_INTERNALS "Controller", "controller");
 }
 
@@ -49,7 +49,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin,
 	: NodeImpl(plugin, path, false, parent, srate)
 	, _learning(false)
 {
-	const Ingen::Shared::LV2URIMap& uris = bufs.uris();
+	const Ingen::Shared::URIs& uris = bufs.uris();
 	_ports = new Raul::Array<PortImpl*>(6);
 
 	_midi_in_port = new InputPort(bufs, this, "input", 0, 1, PortType::EVENTS, Raul::Atom());
diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp
index 30ef663f..d664bf55 100644
--- a/src/server/internals/Controller.hpp
+++ b/src/server/internals/Controller.hpp
@@ -54,7 +54,7 @@ public:
 
 	void learn() { _learning = true; }
 
-	static InternalPlugin* internal_plugin(Shared::LV2URIMap& uris);
+	static InternalPlugin* internal_plugin(Shared::URIs& uris);
 
 private:
 	bool _learning;
diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp
index 4175862c..5d597c53 100644
--- a/src/server/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -47,7 +47,7 @@ namespace Internals {
 
 static const float MAX_DELAY_SECONDS = 8.0f;
 
-InternalPlugin* DelayNode::internal_plugin(Shared::LV2URIMap& uris) {
+InternalPlugin* DelayNode::internal_plugin(Shared::URIs& uris) {
 	return new InternalPlugin(uris, NS_INTERNALS "Delay", "delay");
 }
 
@@ -64,7 +64,7 @@ DelayNode::DelayNode(
 	, _buffer_mask(0)
 	, _write_phase(0)
 {
-	const Ingen::Shared::LV2URIMap& uris = bufs.uris();
+	const Ingen::Shared::URIs& uris = bufs.uris();
 	_ports = new Raul::Array<PortImpl*>(3);
 
 	const float default_delay = 1.0f;
diff --git a/src/server/internals/Delay.hpp b/src/server/internals/Delay.hpp
index 7456d7cc..d1ead156 100644
--- a/src/server/internals/Delay.hpp
+++ b/src/server/internals/Delay.hpp
@@ -50,7 +50,7 @@ public:
 
 	void process(ProcessContext& context);
 
-	static InternalPlugin* internal_plugin(Shared::LV2URIMap& uris);
+	static InternalPlugin* internal_plugin(Shared::URIs& uris);
 
 	float delay_samples() const { return _delay_samples; }
 
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index f28dacc1..0b0acbdc 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -42,7 +42,7 @@ namespace Ingen {
 namespace Server {
 namespace Internals {
 
-InternalPlugin* NoteNode::internal_plugin(Shared::LV2URIMap& uris) {
+InternalPlugin* NoteNode::internal_plugin(Shared::URIs& uris) {
 	return new InternalPlugin(uris, NS_INTERNALS "Note", "note");
 }
 
@@ -58,7 +58,7 @@ NoteNode::NoteNode(
 	, _prepared_voices(NULL)
 	, _sustain(false)
 {
-	const Ingen::Shared::LV2URIMap& uris = bufs.uris();
+	const Ingen::Shared::URIs& uris = bufs.uris();
 	_ports = new Raul::Array<PortImpl*>(5);
 
 	_midi_in_port = new InputPort(bufs, this, "input", 0, 1, PortType::EVENTS, Raul::Atom());
diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp
index d20baf13..6ac0af78 100644
--- a/src/server/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -62,7 +62,7 @@ public:
 	void sustain_on(ProcessContext& context, FrameTime time);
 	void sustain_off(ProcessContext& context, FrameTime time);
 
-	static InternalPlugin* internal_plugin(Shared::LV2URIMap& uris);
+	static InternalPlugin* internal_plugin(Shared::URIs& uris);
 
 private:
 	/** Key, one for each key on the keyboard */
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index d062fa13..349bb1d9 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -38,7 +38,7 @@ namespace Ingen {
 namespace Server {
 namespace Internals {
 
-InternalPlugin* TriggerNode::internal_plugin(Shared::LV2URIMap& uris) {
+InternalPlugin* TriggerNode::internal_plugin(Shared::URIs& uris) {
 	return new InternalPlugin(uris, NS_INTERNALS "Trigger", "trigger");
 }
 
@@ -52,7 +52,7 @@ TriggerNode::TriggerNode(
 	: NodeImpl(plugin, path, false, parent, srate)
 	, _learning(false)
 {
-	const Ingen::Shared::LV2URIMap& uris = bufs.uris();
+	const Ingen::Shared::URIs& uris = bufs.uris();
 	_ports = new Raul::Array<PortImpl*>(5);
 
 	_midi_in_port = new InputPort(bufs, this, "input", 0, 1, PortType::EVENTS, Raul::Atom());
diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp
index 92b85345..2a75ee4f 100644
--- a/src/server/internals/Trigger.hpp
+++ b/src/server/internals/Trigger.hpp
@@ -58,7 +58,7 @@ public:
 
 	void learn() { _learning = true; }
 
-	static InternalPlugin* internal_plugin(Shared::LV2URIMap& uris);
+	static InternalPlugin* internal_plugin(Shared::URIs& uris);
 
 private:
 	bool _learning;