summaryrefslogtreecommitdiffstats
path: root/src/progs/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/server')
-rw-r--r--src/progs/server/main.cpp12
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;