Clean up URI map interface

4 files changed, 12 insertions, 14 deletions

diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 75acd7b2..24d8ad54 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -53,8 +53,7 @@ ControlBindings::ControlBindings(Engine& engine)
 	                       4096)) // FIXME: capacity?
 	, _forge()
 {
-	lv2_atom_forge_init(
-		&_forge, &engine.world().uri_map().urid_map_feature()->urid_map);
+	lv2_atom_forge_init(&_forge, &engine.world().uri_map().urid_map());
 }
 
 ControlBindings::~ControlBindings()
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index b4594cda..b3f669ce 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -76,8 +76,7 @@ JackDriver::JackDriver(Engine& engine)
 	, _old_rolling(false)
 {
 	_midi_event_type = _engine.world().uris().midi_MidiEvent;
-	lv2_atom_forge_init(
-		&_forge, &engine.world().uri_map().urid_map_feature()->urid_map);
+	lv2_atom_forge_init(&_forge, &engine.world().uri_map().urid_map());
 }
 
 JackDriver::~JackDriver()
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index 15c66a2c..090ae8af 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -477,7 +477,7 @@ LV2Block::save_state(const FilePath& dir) const
 
 	LilvState* state = lilv_state_new_from_instance(
 		_lv2_plugin->lilv_plugin(), const_cast<LV2Block*>(this)->instance(0),
-		&world.uri_map().urid_map_feature()->urid_map,
+		&world.uri_map().urid_map(),
 		nullptr, dir.c_str(), dir.c_str(), dir.c_str(), nullptr, nullptr,
 		LV2_STATE_IS_POD|LV2_STATE_IS_PORTABLE, nullptr);
 
@@ -489,8 +489,8 @@ LV2Block::save_state(const FilePath& dir) const
 	}
 
 	lilv_state_save(lworld,
-	                &world.uri_map().urid_map_feature()->urid_map,
-	                &world.uri_map().urid_unmap_feature()->urid_unmap,
+	                &world.uri_map().urid_map(),
+	                &world.uri_map().urid_unmap(),
 	                state,
 	                nullptr,
 	                dir.c_str(),
@@ -511,7 +511,7 @@ LV2Block::duplicate(Engine&             engine,
 	// Get current state
 	LilvState* state = lilv_state_new_from_instance(
 		_lv2_plugin->lilv_plugin(), instance(0),
-		&engine.world().uri_map().urid_map_feature()->urid_map,
+		&engine.world().uri_map().urid_map(),
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, LV2_STATE_IS_NATIVE, nullptr);
 
 	// Duplicate and instantiate block
@@ -625,7 +625,7 @@ LV2Block::load_preset(const URI& uri)
 	lilv_world_load_resource(lworld, preset);
 
 	// Load preset from world
-	LV2_URID_Map* map   = &world.uri_map().urid_map_feature()->urid_map;
+	LV2_URID_Map* map   = &world.uri_map().urid_map();
 	LilvState*    state = lilv_state_new_from_world(lworld, map, preset);
 
 	lilv_node_free(preset);
@@ -641,7 +641,7 @@ LV2Block::load_state(World& world, const FilePath& path)
 
 	LilvState* state = lilv_state_new_from_file(
 		lworld,
-		&world.uri_map().urid_map_feature()->urid_map,
+		&world.uri_map().urid_map(),
 		subject,
 		path.c_str());
 
@@ -692,8 +692,8 @@ LV2Block::save_preset(const URI&        uri,
 {
 	World&          world  = parent_graph()->engine().world();
 	LilvWorld*      lworld = world.lilv_world();
-	LV2_URID_Map*   lmap   = &world.uri_map().urid_map_feature()->urid_map;
-	LV2_URID_Unmap* lunmap = &world.uri_map().urid_unmap_feature()->urid_unmap;
+	LV2_URID_Map*   lmap   = &world.uri_map().urid_map();
+	LV2_URID_Unmap* lunmap = &world.uri_map().urid_unmap();
 
 	const FilePath path     = FilePath(uri.path());
 	const FilePath dirname  = path.parent_path();
diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp
index 40951468..7aea1ba5 100644
--- a/src/server/UndoStack.cpp
+++ b/src/server/UndoStack.cpp
@@ -203,7 +203,7 @@ UndoStack::write_entry(Sratom*                 sratom,
 		                                                           "first"));
 
 		ctx.flags = SERD_LIST_CONT;
-		sratom_write(sratom, &_map.urid_unmap_feature()->urid_unmap, SERD_LIST_CONT,
+		sratom_write(sratom, &_map.urid_unmap(), SERD_LIST_CONT,
 		             &node, &p,
 		             atom->type, atom->size, LV2_ATOM_BODY_CONST(atom));
 
@@ -236,7 +236,7 @@ UndoStack::save(FILE* stream, const char* name)
 	                    stream);
 
 	// Configure sratom to write directly to the writer (and thus the socket)
-	Sratom* sratom = sratom_new(&_map.urid_map_feature()->urid_map);
+	Sratom* sratom = sratom_new(&_map.urid_map());
 	sratom_set_sink(sratom,
 	                reinterpret_cast<const char*>(base.buf),
 	                reinterpret_cast<SerdStatementSink>(serd_writer_write_statement),