diff options
Diffstat (limited to 'src/progs/server/main.cpp')
| -rw-r--r-- | src/progs/server/main.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/progs/server/main.cpp b/src/progs/server/main.cpp index ec1788f0..926a739f 100644 --- a/src/progs/server/main.cpp +++ b/src/progs/server/main.cpp @@ -20,7 +20,9 @@ #include "config.h" #include "util.h" #include "cmdline.h" +#include "tuning.h" #include "Engine.h" +#include "OSCEngineReceiver.h" #ifdef HAVE_LASH #include "LashDriver.h" #endif @@ -30,9 +32,9 @@ #endif using std::cout; using std::endl; using std::cerr; +using namespace Ingen; - -Ingen::Engine* engine; +Engine* engine; void @@ -133,21 +135,30 @@ main(int argc, char** argv) signal(SIGINT, catch_int); signal(SIGTERM, catch_int); - Ingen::set_denormal_flags(); + set_denormal_flags(); + + engine = new Engine(); - engine = new Ingen::Engine(args_info.port_arg); + OSCEngineReceiver* receiver = new OSCEngineReceiver( + *engine, pre_processor_queue_size, args_info.port_arg); + + receiver->activate(); + engine->set_event_source(receiver); #ifdef HAVE_LASH - Ingen::lash_driver = new Ingen::LashDriver(Ingen::om, lash_args); + lash_driver = new LashDriver(engine, lash_args); #endif engine->main(); + receiver->deactivate(); + #ifdef HAVE_LASH - delete Ingen::lash_driver; + delete lash_driver; #endif delete engine; + delete receiver; } return ret; |