From 3b22d3c8c57867cad7304dac1e9be5ee36ae9715 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 28 Aug 2015 03:07:12 +0000 Subject: Get rid of LV2Info class. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5708 a436a847-0d15-0410-975c-d299462d15a1 --- src/World.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/World.cpp') diff --git a/src/World.cpp b/src/World.cpp index 6686a9bf..d3859563 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -105,12 +105,12 @@ public: , argv(a_argv) , lv2_features(NULL) , rdf_world(new Sord::World()) + , lilv_world(lilv_world_new()) , uri_map(new URIMap(log, map, unmap)) , forge(new Forge(*uri_map)) - , uris(new URIs(*forge, uri_map)) + , uris(new URIs(*forge, uri_map, lilv_world)) , log(lv2_log, *uris) , conf(*forge) - , lilv_world(lilv_world_new()) { // Parse default configuration files std::list files = conf.load_default("ingen", "options.ttl"); @@ -205,6 +205,7 @@ public: char**& argv; LV2Features* lv2_features; Sord::World* rdf_world; + LilvWorld* lilv_world; URIMap* uri_map; Forge* forge; URIs* uris; @@ -216,7 +217,6 @@ public: SPtr serialiser; SPtr parser; SPtr store; - LilvWorld* lilv_world; std::mutex rdf_mutex; std::string jack_uuid; }; -- cgit v1.2.1