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/OSCEngineReceiver.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/OSCEngineReceiver.hpp')
| -rw-r--r-- | src/server/OSCEngineReceiver.hpp | 19 |
1 files changed, 12 insertions, 7 deletions
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 |