diff options
| author | David Robillard <d@drobilla.net> | 2006-09-08 03:58:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-09-08 03:58:00 +0000 |
| commit | 48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa (patch) | |
| tree | 9da4b4b075791ac1ec78b499dbcbec6101f54690 /src/progs/server | |
| parent | acbe9a26ec3ab689e430225d15e95e73a7378aa9 (diff) | |
| download | ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.tar.gz ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.tar.bz2 ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.zip | |
De-singleton-ified Engine
Slight rework of Responder/ClientKey/ClientInterface for Requests
git-svn-id: http://svn.drobilla.net/lad/ingen@119 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/server')
| -rw-r--r-- | src/progs/server/main.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/progs/server/main.cpp b/src/progs/server/main.cpp index 8ded37b7..ec1788f0 100644 --- a/src/progs/server/main.cpp +++ b/src/progs/server/main.cpp @@ -32,6 +32,9 @@ using std::cout; using std::endl; using std::cerr; +Ingen::Engine* engine; + + void catch_int(int) { @@ -39,7 +42,7 @@ catch_int(int) signal(SIGTERM, catch_int); std::cout << "[Main] Ingen interrupted." << std::endl; - Ingen::Engine::instance().quit(); + engine->quit(); } @@ -132,20 +135,19 @@ main(int argc, char** argv) Ingen::set_denormal_flags(); - Ingen::Engine::instantiate(args_info.port_arg); + engine = new Ingen::Engine(args_info.port_arg); #ifdef HAVE_LASH Ingen::lash_driver = new Ingen::LashDriver(Ingen::om, lash_args); #endif - Ingen::Engine::instance().main(); + engine->main(); #ifdef HAVE_LASH delete Ingen::lash_driver; #endif - // FIXME: leak - //delete Ingen::om; + delete engine; } return ret; |