diff options
| author | David Robillard <d@drobilla.net> | 2015-02-07 01:05:13 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-02-07 01:05:13 +0000 |
| commit | 82ab6f73fab060860addb30691d0e926b4723ee2 (patch) | |
| tree | d468ccbcae5479161e3f2c899d9e302848ce4e8f /src/ingen | |
| parent | 8dad2d6e0805d0db2cca66f5901235884aad92da (diff) | |
| download | ingen-82ab6f73fab060860addb30691d0e926b4723ee2.tar.gz ingen-82ab6f73fab060860addb30691d0e926b4723ee2.tar.bz2 ingen-82ab6f73fab060860addb30691d0e926b4723ee2.zip | |
Demodularize socket stuff.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5535 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ingen')
| -rw-r--r-- | src/ingen/ingen.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp index f37608b9..6355c753 100644 --- a/src/ingen/ingen.cpp +++ b/src/ingen/ingen.cpp @@ -39,6 +39,9 @@ #ifdef WITH_BINDINGS #include "bindings/ingen_bindings.hpp" #endif +#ifdef HAVE_SOCKET +#include "ingen/client/SocketClient.hpp" +#endif using namespace std; using namespace Ingen; @@ -117,13 +120,9 @@ main(int argc, char** argv) "Unable to load server module"); ingen_try(bool(world->engine()), "Unable to create engine"); + world->engine()->listen(); engine_interface = world->interface(); - -#ifdef HAVE_SOCKET - ingen_try(world->load_module("socket_server"), - "Unable to load socket server module"); -#endif } // If we don't have a local engine interface (for GUI), use network @@ -131,8 +130,7 @@ main(int argc, char** argv) ingen_try(world->load_module("client"), "Unable to load client module"); #ifdef HAVE_SOCKET - ingen_try(world->load_module("socket_client"), - "Unable to load socket client module"); + Client::SocketClient::register_factories(world); #endif const char* const uri = conf.option("connect").ptr<char>(); ingen_try(Raul::URI::is_valid(uri), |