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/libs/engine/OmInProcess.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/libs/engine/OmInProcess.cpp')
| -rw-r--r-- | src/libs/engine/OmInProcess.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libs/engine/OmInProcess.cpp b/src/libs/engine/OmInProcess.cpp index af27e7c9..b5cee7f3 100644 --- a/src/libs/engine/OmInProcess.cpp +++ b/src/libs/engine/OmInProcess.cpp @@ -19,9 +19,7 @@ #include <stdio.h> #include <memory.h> #include <jack/jack.h> - -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "OSCReceiver.h" #include "JackAudioDriver.h" #ifdef HAVE_LASH @@ -38,7 +36,7 @@ extern "C" void* run_main(void* arg) { - Om::om->main(); + Om::Ingen::instance().main(); #ifdef HAVE_LASH delete Om::lash_driver; @@ -55,7 +53,7 @@ pthread_t main_thread; int jack_initialize(jack_client_t* client, const char* load_init) { - if ((Om::om = new Om::OmApp(load_init, new Om::JackAudioDriver(client))) != NULL) { + if ((Om::om = new Om::Ingen(load_init, new Om::JackAudioDriver(client))) != NULL) { pthread_create(&main_thread, NULL, run_main, NULL); return 0; // Success } else { @@ -68,7 +66,7 @@ void jack_finish(void* arg) { void* ret; - Om::om->quit(); + Om::Ingen::instance().quit(); pthread_join(main_thread, &ret); } |