diff options
author | David Robillard <d@drobilla.net> | 2012-05-10 04:02:24 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-05-10 04:02:24 +0000 |
commit | 8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4 (patch) | |
tree | af044468e3f20bea5c18d02ba35cd3a69cdc4808 /src/socket/SocketReader.cpp | |
parent | da468f24388d7f0f574c6e4dd4022e05d47a9db2 (diff) | |
download | ingen-8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4.tar.gz ingen-8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4.tar.bz2 ingen-8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4.zip |
LV2URIMap => URIMap.
Trim unnecessary includes.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4337 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/socket/SocketReader.cpp')
-rw-r--r-- | src/socket/SocketReader.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/socket/SocketReader.cpp b/src/socket/SocketReader.cpp index 74d441ef..94c3abdb 100644 --- a/src/socket/SocketReader.cpp +++ b/src/socket/SocketReader.cpp @@ -18,10 +18,12 @@ #include <poll.h> #include "ingen/Interface.hpp" -#include "ingen/shared/World.hpp" #include "ingen/shared/AtomReader.hpp" +#include "ingen/shared/URIMap.hpp" +#include "ingen/shared/World.hpp" #include "sord/sordmm.hpp" #include "sratom/sratom.h" + #include "SocketReader.hpp" #define LOG(s) s << "[SocketReader] " @@ -88,7 +90,7 @@ void SocketReader::_run() { Sord::World* world = _world.rdf_world(); - LV2_URID_Map* map = &_world.lv2_uri_map()->urid_map_feature()->urid_map; + LV2_URID_Map* map = &_world.uri_map()->urid_map_feature()->urid_map; // Use <path:> as base URI so e.g. </foo/bar> will be a path SordNode* base_uri = sord_new_uri( @@ -130,7 +132,7 @@ SocketReader::_run() serd_reader_start_stream(reader, f, (const uint8_t*)"(socket)", false); // Make an AtomReader to call Ingen Interface methods based on Atom - Shared::AtomReader ar(*_world.lv2_uri_map().get(), + Shared::AtomReader ar(*_world.uri_map().get(), *_world.uris().get(), _world.forge(), _iface); |