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

1 files changed, 14 insertions, 9 deletions

diff --git a/src/server/HTTPEngineReceiver.hpp b/src/server/HTTPEngineReceiver.hpp
index f942ee96..67e47ec4 100644
--- a/src/server/HTTPEngineReceiver.hpp
+++ b/src/server/HTTPEngineReceiver.hpp
@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include "ServerInterfaceImpl.hpp"
+#include "raul/Thread.hpp"
 
 typedef struct _SoupServer SoupServer;
 typedef struct _SoupMessage SoupMessage;
@@ -31,20 +31,23 @@ typedef struct SoupClientContext SoupClientContext;
 namespace Ingen {
 namespace Server {
 
-class HTTPEngineReceiver : public ServerInterfaceImpl
+class ServerInterfaceImpl;
+class Engine;
+
+class HTTPEngineReceiver
 {
 public:
-	HTTPEngineReceiver(Engine& engine, uint16_t port);
+	HTTPEngineReceiver(Engine&                        engine,
+	                   SharedPtr<ServerInterfaceImpl> interface,
+	                   uint16_t                       port);
+
 	~HTTPEngineReceiver();
 
 private:
 	struct ReceiveThread : public Raul::Thread {
 		explicit ReceiveThread(HTTPEngineReceiver& receiver) : _receiver(receiver) {}
 		virtual void _run();
-		virtual void whip() {
-			while (_receiver.unprepared_events())
-				_receiver.whip();
-		}
+		virtual void whip();
 	private:
 		HTTPEngineReceiver& _receiver;
 	};
@@ -54,8 +57,10 @@ private:
 	static void message_callback(SoupServer* server, SoupMessage* msg, const char* path,
 			GHashTable *query, SoupClientContext* client, void* data);
 
-	ReceiveThread* _receive_thread;
-	SoupServer*    _server;
+	Engine&                        _engine;
+	SharedPtr<ServerInterfaceImpl> _interface;
+	ReceiveThread*                 _receive_thread;
+	SoupServer*                    _server;
 };
 
 } // namespace Server