From 0d4792af695d94a1e476adcdb65eed8a501ddbd4 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 21 Oct 2011 21:45:14 +0000
Subject: Make OSCEngineReceiver and HTTPEngineReceiver has-a
 ServerInterfaceImpl (instead of is-a).

Towards further modularization...


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3570 a436a847-0d15-0410-975c-d299462d15a1
---
 src/server/OSCEngineReceiver.hpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

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

diff --git a/src/server/OSCEngineReceiver.hpp b/src/server/OSCEngineReceiver.hpp
index 4282b0a8..a165afc0 100644
--- a/src/server/OSCEngineReceiver.hpp
+++ b/src/server/OSCEngineReceiver.hpp
@@ -20,16 +20,16 @@
 
 #include <stdint.h>
 #include <lo/lo.h>
-#include "ServerInterfaceImpl.hpp"
+
 #include "Request.hpp"
 #include "ingen-config.h"
 
 namespace Ingen {
+
 namespace Server {
 
-class JackDriver;
-class NodeFactory;
-class PatchImpl;
+class Engine;
+class ServerInterfaceImpl;
 
 /* Some boilerplate killing macros... */
 #define LO_HANDLER_ARGS const char* path, const char* types, lo_arg** argv, int argc, lo_message msg
@@ -54,10 +54,13 @@ inline static int name##_cb(LO_HANDLER_ARGS, void* myself)\
  *
  * \ingroup engine
  */
-class OSCEngineReceiver : public ServerInterfaceImpl
+class OSCEngineReceiver
 {
 public:
-	OSCEngineReceiver(Engine& engine, uint16_t port);
+	OSCEngineReceiver(Engine&                        engine,
+	                  SharedPtr<ServerInterfaceImpl> interface,
+	                  uint16_t                       port);
+
 	~OSCEngineReceiver();
 
 private:
@@ -116,7 +119,9 @@ private:
 	LO_HANDLER(set_property);
 	LO_HANDLER(property_set);
 
-	lo_server _server;
+	Engine&                        _engine;
+	SharedPtr<ServerInterfaceImpl> _interface;
+	lo_server                      _server;
 };
 
 } // namespace Server
-- 
cgit v1.2.1