Separate EventWriter interface from EventQueue.

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

1 files changed, 8 insertions, 6 deletions

diff --git a/src/socket/ingen_socket_server.cpp b/src/socket/ingen_socket_server.cpp
index 7ee20217..19257add 100644
--- a/src/socket/ingen_socket_server.cpp
+++ b/src/socket/ingen_socket_server.cpp
@@ -20,7 +20,8 @@
 #include "ingen/shared/World.hpp"
 
 #include "../server/Engine.hpp"
-#include "../server/ServerInterfaceImpl.hpp"
+#include "../server/EventWriter.hpp"
+#include "../server/EventQueue.hpp"
 
 #include "SocketListener.hpp"
 
@@ -29,15 +30,16 @@ using namespace Ingen;
 struct IngenSocketServerModule : public Ingen::Shared::Module {
 	void load(Ingen::Shared::World* world) {
 		Server::Engine* engine = (Server::Engine*)world->local_engine().get();
-		SharedPtr<Server::ServerInterfaceImpl> interface(
-			new Server::ServerInterfaceImpl(*engine));
-		receiver = SharedPtr<Ingen::Socket::SocketListener>(
+		SharedPtr<Server::EventQueue> queue(new Server::EventQueue());
+		SharedPtr<Server::EventWriter> interface(
+			new Server::EventWriter(*engine, *queue.get()));
+		listener = SharedPtr<Ingen::Socket::SocketListener>(
 			new Ingen::Socket::SocketListener(*world, interface));
 
-		engine->add_event_source(interface);
+		engine->add_event_source(queue);
 	}
 
-	SharedPtr<Ingen::Socket::SocketListener> receiver;
+	SharedPtr<Ingen::Socket::SocketListener> listener;
 };
 
 extern "C" {