From 9ae720fdc60d7e40b1b8be7c1133a57acb4e564c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 3 May 2012 02:56:09 +0000 Subject: Separate EventWriter interface from EventQueue. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4319 a436a847-0d15-0410-975c-d299462d15a1 --- src/socket/ingen_socket_server.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/socket/ingen_socket_server.cpp') 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 interface( - new Server::ServerInterfaceImpl(*engine)); - receiver = SharedPtr( + SharedPtr queue(new Server::EventQueue()); + SharedPtr interface( + new Server::EventWriter(*engine, *queue.get())); + listener = SharedPtr( new Ingen::Socket::SocketListener(*world, interface)); - engine->add_event_source(interface); + engine->add_event_source(queue); } - SharedPtr receiver; + SharedPtr listener; }; extern "C" { -- cgit v1.2.1