diff options
| author | David Robillard <d@drobilla.net> | 2006-07-18 05:46:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-18 05:46:24 +0000 |
| commit | 2dbd0cd81dff72aea42344188d20f7d7f6d20e1a (patch) | |
| tree | a3af76b4164c75b19d3973c88b05591be9e9d67d /src/progs/server/main.cpp | |
| parent | 1d81360a04e0e5c0a57b8be1708e29a3f2bde848 (diff) | |
| download | ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.tar.gz ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.tar.bz2 ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.zip | |
Removed globals (Om.h)
git-svn-id: http://svn.drobilla.net/lad/ingen@96 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/server/main.cpp')
| -rw-r--r-- | src/progs/server/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/progs/server/main.cpp b/src/progs/server/main.cpp index fdd39c53..2429462a 100644 --- a/src/progs/server/main.cpp +++ b/src/progs/server/main.cpp @@ -20,8 +20,7 @@ #include "config.h" #include "util.h" #include "cmdline.h" -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #ifdef HAVE_LASH #include "LashDriver.h" #endif @@ -40,7 +39,7 @@ catch_int(int) signal(SIGTERM, catch_int); std::cout << "[Main] Om interrupted." << std::endl; - Om::om->quit(); + Om::Ingen::instance().quit(); } @@ -133,19 +132,20 @@ main(int argc, char** argv) Om::set_denormal_flags(); - Om::om = new Om::OmApp(args_info.port_arg); + Om::Ingen::instantiate(args_info.port_arg); #ifdef HAVE_LASH Om::lash_driver = new Om::LashDriver(Om::om, lash_args); #endif - Om::om->main(); + Om::Ingen::instance().main(); #ifdef HAVE_LASH delete Om::lash_driver; #endif - delete Om::om; + // FIXME: leak + //delete Om::om; } return ret; |