LV2URIMap => URIMap.

Trim unnecessary includes.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4337 a436a847-0d15-0410-975c-d299462d15a1

5 files changed, 25 insertions, 21 deletions

diff --git a/src/socket/SocketClient.hpp b/src/socket/SocketClient.hpp
index d75288e0..de2b473b 100644
--- a/src/socket/SocketClient.hpp
+++ b/src/socket/SocketClient.hpp
@@ -31,7 +31,7 @@ public:
 	             const std::string&   uri,
 	             SharedPtr<Socket>    sock,
 	             SharedPtr<Interface> respondee)
-		: SocketWriter(*world.lv2_uri_map().get(),
+		: SocketWriter(*world.uri_map().get(),
 		               *world.uris().get(),
 		               uri,
 		               sock)
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);
diff --git a/src/socket/SocketServer.hpp b/src/socket/SocketServer.hpp
index 55434030..d03e7d4b 100644
--- a/src/socket/SocketServer.hpp
+++ b/src/socket/SocketServer.hpp
@@ -35,7 +35,7 @@ public:
 		: Server::EventWriter(engine)
 		, SocketReader(world, *this, sock)
 		, _engine(engine)
-		, _writer(new SocketWriter(*world.lv2_uri_map().get(),
+		, _writer(new SocketWriter(*world.uri_map().get(),
 		                           *world.uris().get(),
 		                           sock->uri(),
 		                           sock))
diff --git a/src/socket/SocketWriter.cpp b/src/socket/SocketWriter.cpp
index 808d62cf..e704e5af 100644
--- a/src/socket/SocketWriter.cpp
+++ b/src/socket/SocketWriter.cpp
@@ -18,6 +18,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include "ingen/shared/URIMap.hpp"
+
 #include "SocketWriter.hpp"
 
 namespace Ingen {
@@ -34,10 +36,10 @@ socket_sink(const void* buf, size_t len, void* stream)
 	return ret;
 }
 
-SocketWriter::SocketWriter(Shared::LV2URIMap& map,
-                           Shared::URIs&      uris,
-                           const Raul::URI&   uri,
-                           SharedPtr<Socket>  sock)
+SocketWriter::SocketWriter(Shared::URIMap&   map,
+                           Shared::URIs&     uris,
+                           const Raul::URI&  uri,
+                           SharedPtr<Socket> sock)
 	: AtomWriter(map, uris, *this)
 	, _map(map)
 	, _sratom(sratom_new(&map.urid_map_feature()->urid_map))
diff --git a/src/socket/SocketWriter.hpp b/src/socket/SocketWriter.hpp
index 902538f6..2e27ea98 100644
--- a/src/socket/SocketWriter.hpp
+++ b/src/socket/SocketWriter.hpp
@@ -36,10 +36,10 @@ namespace Socket {
 class SocketWriter : public Shared::AtomWriter, public Shared::AtomSink
 {
 public:
-	SocketWriter(Shared::LV2URIMap& map,
-	             Shared::URIs&      uris,
-	             const Raul::URI&   uri,
-	             SharedPtr<Socket>  sock);
+	SocketWriter(Shared::URIMap&   map,
+	             Shared::URIs&     uris,
+	             const Raul::URI&  uri,
+	             SharedPtr<Socket> sock);
 
 	~SocketWriter();
 
@@ -49,14 +49,14 @@ public:
 	Raul::URI uri() const { return _uri; }
 
 protected:
-	Shared::LV2URIMap& _map;
-	Sratom*            _sratom;
-	SerdNode           _base;
-	SerdURI            _base_uri;
-	SerdEnv*           _env;
-	SerdWriter*        _writer;
-	Raul::URI          _uri;
-	SharedPtr<Socket>  _socket;
+	Shared::URIMap&   _map;
+	Sratom*           _sratom;
+	SerdNode          _base;
+	SerdURI           _base_uri;
+	SerdEnv*          _env;
+	SerdWriter*       _writer;
+	Raul::URI         _uri;
+	SharedPtr<Socket> _socket;
 };
 
 }  // namespace Socket