diff options
author | David Robillard <d@drobilla.net> | 2011-10-21 21:45:14 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-10-21 21:45:14 +0000 |
commit | 0d4792af695d94a1e476adcdb65eed8a501ddbd4 (patch) | |
tree | 1c0fc824541fcdbb057f5a0909bc8cf7704dccfe /src/server/HTTPEngineReceiver.hpp | |
parent | 4ce6781bd6727fca68d4c99337f47a75d849e5ab (diff) | |
download | ingen-0d4792af695d94a1e476adcdb65eed8a501ddbd4.tar.gz ingen-0d4792af695d94a1e476adcdb65eed8a501ddbd4.tar.bz2 ingen-0d4792af695d94a1e476adcdb65eed8a501ddbd4.zip |
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
Diffstat (limited to 'src/server/HTTPEngineReceiver.hpp')
-rw-r--r-- | src/server/HTTPEngineReceiver.hpp | 23 |
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 |