From 8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 10 May 2012 04:02:24 +0000 Subject: LV2URIMap => URIMap. Trim unnecessary includes. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4337 a436a847-0d15-0410-975c-d299462d15a1 --- src/serialisation/Parser.cpp | 6 +++--- src/serialisation/Serialiser.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/serialisation') diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index 24b96b8d..c1cce1ee 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -23,7 +23,7 @@ #include "ingen/Interface.hpp" #include "ingen/serialisation/Parser.hpp" -#include "ingen/shared/LV2URIMap.hpp" +#include "ingen/shared/URIMap.hpp" #include "ingen/shared/URIs.hpp" #include "ingen/shared/World.hpp" #include "raul/Atom.hpp" @@ -99,8 +99,8 @@ get_properties(Ingen::Shared::World* world, const Sord::Node& subject) { SerdChunk out = { NULL, 0 }; - LV2_URID_Map* map = &world->lv2_uri_map()->urid_map_feature()->urid_map; - LV2_URID_Unmap* unmap = &world->lv2_uri_map()->urid_unmap_feature()->urid_unmap; + LV2_URID_Map* map = &world->uri_map()->urid_map_feature()->urid_map; + LV2_URID_Unmap* unmap = &world->uri_map()->urid_unmap_feature()->urid_unmap; Sratom* sratom = sratom_new(map); LV2_Atom_Forge forge; diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index f16ed1d7..792d7f92 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -35,9 +35,9 @@ #include "ingen/Plugin.hpp" #include "ingen/Port.hpp" #include "ingen/serialisation/Serialiser.hpp" -#include "ingen/shared/LV2URIMap.hpp" #include "ingen/shared/ResourceImpl.hpp" #include "ingen/shared/Store.hpp" +#include "ingen/shared/URIMap.hpp" #include "ingen/shared/URIs.hpp" #include "ingen/shared/World.hpp" #include "lv2/lv2plug.in/ns/ext/state/state.h" @@ -544,8 +544,8 @@ Serialiser::Impl::serialise_properties(const GraphObject* o, { const GraphObject::Properties props = o->properties(context); - LV2_URID_Map* map = &_world.lv2_uri_map()->urid_map_feature()->urid_map; - LV2_URID_Unmap* unmap = &_world.lv2_uri_map()->urid_unmap_feature()->urid_unmap; + LV2_URID_Map* map = &_world.uri_map()->urid_map_feature()->urid_map; + LV2_URID_Unmap* unmap = &_world.uri_map()->urid_unmap_feature()->urid_unmap; Sratom* sratom = sratom_new(map); SerdNode base = serd_node_from_string(SERD_URI, (const uint8_t*)_base_uri.c_str()); -- cgit v1.2.1