From 9da093217352daa1fb61a6f2daf5195640e286a7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 16 Mar 2012 04:13:23 +0000
Subject: Merge ClientInterface and ServerInterface.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4067 a436a847-0d15-0410-975c-d299462d15a1
---
 src/server/Event.hpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/server/Event.hpp')

diff --git a/src/server/Event.hpp b/src/server/Event.hpp
index 8bb1d8aa..b933a8ca 100644
--- a/src/server/Event.hpp
+++ b/src/server/Event.hpp
@@ -24,14 +24,12 @@
 #include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
 
+#include "ingen/Interface.hpp"
 #include "ingen/Status.hpp"
 
 #include "types.hpp"
 
 namespace Ingen {
-
-class ClientInterface;
-
 namespace Server {
 
 class Engine;
@@ -82,7 +80,7 @@ public:
 	void respond(Status status);
 
 protected:
-	Event(Engine& engine, ClientInterface* client, int32_t id, FrameTime time)
+	Event(Engine& engine, Interface* client, int32_t id, FrameTime time)
 		: _engine(engine)
 		, _request_client(client)
 		, _request_id(id)
@@ -105,7 +103,7 @@ protected:
 
 	Engine&                _engine;
 	Raul::AtomicPtr<Event> _next;
-	ClientInterface*       _request_client;
+	Interface*             _request_client;
 	int32_t                _request_id;
 	FrameTime              _time;
 	Status                 _status;
-- 
cgit v1.2.1