diff options
Diffstat (limited to 'src/shared/World.cpp')
| -rw-r--r-- | src/shared/World.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/shared/World.cpp b/src/shared/World.cpp index d2d5f74c..1d47100a 100644 --- a/src/shared/World.cpp +++ b/src/shared/World.cpp @@ -31,7 +31,7 @@ #include "ingen/shared/World.hpp" #include "ingen/shared/runtime_paths.hpp" #include "ingen/shared/LV2Features.hpp" -#include "ingen/shared/LV2URIMap.hpp" +#include "ingen/shared/URIMap.hpp" #include "ingen/shared/URIs.hpp" #define LOG(s) s << "[Module] " @@ -109,14 +109,14 @@ public: , conf(conf) , lv2_features(NULL) , rdf_world(new Sord::World()) - , lv2_uri_map(new Ingen::Shared::LV2URIMap(map, unmap)) - , forge(new Ingen::Forge(*lv2_uri_map)) - , uris(new Shared::URIs(*forge, lv2_uri_map.get())) + , uri_map(new Ingen::Shared::URIMap(map, unmap)) + , forge(new Ingen::Forge(*uri_map)) + , uris(new Shared::URIs(*forge, uri_map.get())) , lilv_world(lilv_world_new()) { lv2_features = new Ingen::Shared::LV2Features(); - lv2_features->add_feature(lv2_uri_map->urid_map_feature()); - lv2_features->add_feature(lv2_uri_map->urid_unmap_feature()); + lv2_features->add_feature(uri_map->urid_map_feature()); + lv2_features->add_feature(uri_map->urid_unmap_feature()); lilv_world_load_all(lilv_world); // Set up RDF namespaces @@ -173,7 +173,7 @@ public: Raul::Configuration* conf; LV2Features* lv2_features; Sord::World* rdf_world; - SharedPtr<LV2URIMap> lv2_uri_map; + SharedPtr<URIMap> uri_map; Ingen::Forge* forge; SharedPtr<URIs> uris; SharedPtr<Interface> engine; @@ -218,10 +218,10 @@ Raul::Configuration* World::conf() { return _impl->conf; Ingen::Forge& World::forge() { return *_impl->forge; } 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<URIs> World::uris() { return _impl->uris; } -SharedPtr<LV2URIMap> World::lv2_uri_map() { return _impl->lv2_uri_map; } +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<URIMap> World::uri_map() { return _impl->uri_map; } /** Load an Ingen module. * @return true on success, false on failure |