diff options
| author | David Robillard <d@drobilla.net> | 2006-07-19 08:59:30 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-19 08:59:30 +0000 |
| commit | 466f306c1154b7aeccff301b8597872b82e3c806 (patch) | |
| tree | 1b8d9d6c4a778f0f5cf36522295a66d3493e1adc /src/libs/engine/OmInProcess.cpp | |
| parent | 2dbd0cd81dff72aea42344188d20f7d7f6d20e1a (diff) | |
| download | ingen-466f306c1154b7aeccff301b8597872b82e3c806.tar.gz ingen-466f306c1154b7aeccff301b8597872b82e3c806.tar.bz2 ingen-466f306c1154b7aeccff301b8597872b82e3c806.zip | |
Changed namespace names, removed almost all references to "Om"
git-svn-id: http://svn.drobilla.net/lad/ingen@97 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/OmInProcess.cpp')
| -rw-r--r-- | src/libs/engine/OmInProcess.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
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); } |