From 7be6d5d05756a7dea20c494d56f364b4dc064c88 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 11 May 2012 03:01:26 +0000
Subject: Clean up and better document World interface.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4344 a436a847-0d15-0410-975c-d299462d15a1
---
 src/socket/Socket.hpp         | 1 +
 src/socket/SocketClient.hpp   | 5 +----
 src/socket/SocketListener.cpp | 3 ++-
 src/socket/SocketReader.cpp   | 8 +++-----
 src/socket/SocketServer.hpp   | 4 ++--
 5 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/socket')

diff --git a/src/socket/Socket.hpp b/src/socket/Socket.hpp
index dd62aefa..e4dbb60a 100644
--- a/src/socket/Socket.hpp
+++ b/src/socket/Socket.hpp
@@ -18,6 +18,7 @@
 #define INGEN_SOCKET_SOCKET_HPP
 
 #include <stdint.h>
+#include <string.h>
 #include <sys/socket.h>
 
 #include <string>
diff --git a/src/socket/SocketClient.hpp b/src/socket/SocketClient.hpp
index de2b473b..f216a166 100644
--- a/src/socket/SocketClient.hpp
+++ b/src/socket/SocketClient.hpp
@@ -31,10 +31,7 @@ public:
 	             const std::string&   uri,
 	             SharedPtr<Socket>    sock,
 	             SharedPtr<Interface> respondee)
-		: SocketWriter(*world.uri_map().get(),
-		               *world.uris().get(),
-		               uri,
-		               sock)
+		: SocketWriter(world.uri_map(), world.uris(), uri, sock)
 		, _respondee(respondee)
 		, _reader(world, *respondee.get(), sock)
 	{
diff --git a/src/socket/SocketListener.cpp b/src/socket/SocketListener.cpp
index 6861a717..cbd29d7e 100644
--- a/src/socket/SocketListener.cpp
+++ b/src/socket/SocketListener.cpp
@@ -21,8 +21,9 @@
 #include <string>
 
 #include "ingen/Interface.hpp"
-#include "ingen/shared/World.hpp"
 #include "ingen/shared/AtomReader.hpp"
+#include "ingen/shared/Configuration.hpp"
+#include "ingen/shared/World.hpp"
 #include "sord/sordmm.hpp"
 #include "sratom/sratom.h"
 
diff --git a/src/socket/SocketReader.cpp b/src/socket/SocketReader.cpp
index 94c3abdb..bef14f92 100644
--- a/src/socket/SocketReader.cpp
+++ b/src/socket/SocketReader.cpp
@@ -90,7 +90,7 @@ void
 SocketReader::_run()
 {
 	Sord::World*  world = _world.rdf_world();
-	LV2_URID_Map* map   = &_world.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(
@@ -132,10 +132,8 @@ 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.uri_map().get(),
-	                      *_world.uris().get(),
-	                      _world.forge(),
-	                      _iface);
+	Shared::AtomReader ar(
+		_world.uri_map(), _world.uris(), _world.forge(), _iface);
 
 	struct pollfd pfd;
 	pfd.fd      = _socket->fd();
diff --git a/src/socket/SocketServer.hpp b/src/socket/SocketServer.hpp
index d03e7d4b..6732ed4e 100644
--- a/src/socket/SocketServer.hpp
+++ b/src/socket/SocketServer.hpp
@@ -35,8 +35,8 @@ public:
 		: Server::EventWriter(engine)
 		, SocketReader(world, *this, sock)
 		, _engine(engine)
-		, _writer(new SocketWriter(*world.uri_map().get(),
-		                           *world.uris().get(),
+		, _writer(new SocketWriter(world.uri_map(),
+		                           world.uris(),
 		                           sock->uri(),
 		                           sock))
 	{
-- 
cgit v1.2.1