summaryrefslogtreecommitdiffstats
path: root/src/libs/engine/OmInProcess.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-07-20 04:15:03 +0000
committerDavid Robillard <d@drobilla.net>2006-07-20 04:15:03 +0000
commitb5b6dba0480b3dcec4b130ea606d63f4a3854920 (patch)
tree22e3c06d815da7b33f6061253c94cf3621b37265 /src/libs/engine/OmInProcess.cpp
parent767b10d6fa3313b2bd4e1dcc0d96dda3409c4944 (diff)
downloadingen-b5b6dba0480b3dcec4b130ea606d63f4a3854920.tar.gz
ingen-b5b6dba0480b3dcec4b130ea606d63f4a3854920.tar.bz2
ingen-b5b6dba0480b3dcec4b130ea606d63f4a3854920.zip
Renamed Engine class to "Engine" (from "Ingen") to avoid confusion with namespace Ingen
git-svn-id: http://svn.drobilla.net/lad/ingen@99 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/OmInProcess.cpp')
-rw-r--r--src/libs/engine/OmInProcess.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/engine/OmInProcess.cpp b/src/libs/engine/OmInProcess.cpp
index 73d96946..2096204e 100644
--- a/src/libs/engine/OmInProcess.cpp
+++ b/src/libs/engine/OmInProcess.cpp
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <memory.h>
#include <jack/jack.h>
-#include "Ingen.h"
+#include "Engine.h"
#include "OSCReceiver.h"
#include "JackAudioDriver.h"
#ifdef HAVE_LASH
@@ -36,7 +36,7 @@ extern "C"
void*
run_main(void* arg)
{
- Ingen::Ingen::instance().main();
+ Engine::instance().main();
// FIXME: cleanup
@@ -50,7 +50,7 @@ pthread_t main_thread;
int
jack_initialize(jack_client_t* client, const char* load_init)
{
- if ((Ingen::om = new Ingen::Ingen(load_init, new Ingen::JackAudioDriver(client))) != NULL) {
+ if ((Ingen::om = new Engine(load_init, new Ingen::JackAudioDriver(client))) != NULL) {
pthread_create(&main_thread, NULL, run_main, NULL);
return 0; // Success
} else {
@@ -63,7 +63,7 @@ void
jack_finish(void* arg)
{
void* ret;
- Ingen::Ingen::instance().quit();
+ Engine::instance().quit();
pthread_join(main_thread, &ret);
}