summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-08-28 03:07:12 +0000
committerDavid Robillard <d@drobilla.net>2015-08-28 03:07:12 +0000
commit3b22d3c8c57867cad7304dac1e9be5ee36ae9715 (patch)
tree3de4bd2f383346164ecbee3a55d17a28d32623df /src/World.cpp
parente6f29e606ba73af640469e3ee1e2198893ce3e5c (diff)
downloadingen-3b22d3c8c57867cad7304dac1e9be5ee36ae9715.tar.gz
ingen-3b22d3c8c57867cad7304dac1e9be5ee36ae9715.tar.bz2
ingen-3b22d3c8c57867cad7304dac1e9be5ee36ae9715.zip
Get rid of LV2Info class.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5708 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp6
1 files changed, 3 insertions, 3 deletions
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<std::string> 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> serialiser;
SPtr<Parser> parser;
SPtr<Store> store;
- LilvWorld* lilv_world;
std::mutex rdf_mutex;
std::string jack_uuid;
};