From 466f306c1154b7aeccff301b8597872b82e3c806 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 19 Jul 2006 08:59:30 +0000 Subject: Changed namespace names, removed almost all references to "Om" git-svn-id: http://svn.drobilla.net/lad/ingen@97 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/OmInProcess.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/libs/engine/OmInProcess.cpp') diff --git a/src/libs/engine/OmInProcess.cpp b/src/libs/engine/OmInProcess.cpp index b5cee7f3..73d96946 100644 --- a/src/libs/engine/OmInProcess.cpp +++ b/src/libs/engine/OmInProcess.cpp @@ -36,13 +36,10 @@ extern "C" void* run_main(void* arg) { - Om::Ingen::instance().main(); -#ifdef HAVE_LASH - - delete Om::lash_driver; -#endif - - delete Om::om; + Ingen::Ingen::instance().main(); + + // FIXME: cleanup + return 0; } @@ -53,7 +50,7 @@ pthread_t main_thread; int jack_initialize(jack_client_t* client, const char* load_init) { - if ((Om::om = new Om::Ingen(load_init, new Om::JackAudioDriver(client))) != NULL) { + if ((Ingen::om = new Ingen::Ingen(load_init, new Ingen::JackAudioDriver(client))) != NULL) { pthread_create(&main_thread, NULL, run_main, NULL); return 0; // Success } else { @@ -66,7 +63,7 @@ void jack_finish(void* arg) { void* ret; - Om::Ingen::instance().quit(); + Ingen::Ingen::instance().quit(); pthread_join(main_thread, &ret); } -- cgit v1.2.1