From ee1ba36e564c4f0545e50ec91fa4b14d6dfca91b Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 21 Oct 2011 19:29:03 +0000
Subject: Separate URIs from LV2URIMap.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3564 a436a847-0d15-0410-975c-d299462d15a1
---
 src/shared/World.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/shared/World.cpp')

diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index ba1e6802..4f6b279b 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -103,11 +103,12 @@ public:
 		, conf(conf)
 		, lv2_features(NULL)
 		, rdf_world(new Sord::World())
-		, uris(new Shared::LV2URIMap())
+		, uris(new Shared::URIs())
+		, lv2_uri_map(new Ingen::Shared::LV2URIMap(*uris.get()))
 		, lilv_world(lilv_world_new())
 	{
 		lv2_features = new Ingen::Shared::LV2Features();
-		lv2_features->add_feature(uris);
+		lv2_features->add_feature(lv2_uri_map);
 		lilv_world_load_all(lilv_world);
 
 		// Set up RDF namespaces
@@ -165,7 +166,8 @@ public:
 	Raul::Configuration*                 conf;
 	LV2Features*                         lv2_features;
 	Sord::World*                         rdf_world;
-	SharedPtr<LV2URIMap>                 uris;
+	SharedPtr<URIs>                      uris;
+	SharedPtr<LV2URIMap>                 lv2_uri_map;
 	SharedPtr<ServerInterface>           engine;
 	SharedPtr<EngineBase>                local_engine;
 	SharedPtr<Serialisation::Serialiser> serialiser;
@@ -206,9 +208,10 @@ SharedPtr<ClientInterface>           World::client()       { return _impl->clien
 Raul::Configuration*                 World::conf()         { return _impl->conf; }
 LV2Features*                         World::lv2_features() { return _impl->lv2_features; }
 
-LilvWorld*           World::lilv_world() { return _impl->lilv_world; }
-Sord::World*         World::rdf_world() { return _impl->rdf_world; }
-SharedPtr<LV2URIMap> World::uris()      { return _impl->uris; }
+LilvWorld*           World::lilv_world()  { return _impl->lilv_world; }
+Sord::World*         World::rdf_world()   { return _impl->rdf_world; }
+SharedPtr<URIs>      World::uris()        { return _impl->uris; }
+SharedPtr<LV2URIMap> World::lv2_uri_map() { return _impl->lv2_uri_map; }
 
 /** Load an Ingen module.
  * @return true on success, false on failure
-- 
cgit v1.2.1