diff options
author | David Robillard <d@drobilla.net> | 2006-06-10 01:52:02 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-06-10 01:52:02 +0000 |
commit | 98fe0e7056e6697396249531785d3899f94d79be (patch) | |
tree | 233319008d4bfb6c8bdc546bdf4a81b87ecf7f3a /src/engine/OmInProcess.cpp | |
parent | 6c8eaee73b0ea66216744f49b452e22e26fe83e1 (diff) | |
download | ingen-98fe0e7056e6697396249531785d3899f94d79be.tar.gz ingen-98fe0e7056e6697396249531785d3899f94d79be.tar.bz2 ingen-98fe0e7056e6697396249531785d3899f94d79be.zip |
More juggling
git-svn-id: http://svn.drobilla.net/lad/grauph@15 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/OmInProcess.cpp')
-rw-r--r-- | src/engine/OmInProcess.cpp | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/src/engine/OmInProcess.cpp b/src/engine/OmInProcess.cpp deleted file mode 100644 index 971a1316..00000000 --- a/src/engine/OmInProcess.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Mario Lang. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <pthread.h> -#include <stdlib.h> -#include <stdio.h> -#include <memory.h> -#include <jack/jack.h> - -#include "Om.h" -#include "OmApp.h" -#include "OSCReceiver.h" -#include "JackAudioDriver.h" -#ifdef HAVE_LASH -#include "LashDriver.h" -#endif - -extern "C" -{ - int jack_initialize(jack_client_t* client, const char* load_init); - void jack_finish(void* arg); -} - - -void* -run_main(void* arg) -{ - Om::om->main(); -#ifdef HAVE_LASH - - delete Om::lash_driver; -#endif - - delete Om::om; - return 0; -} - - -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) { - pthread_create(&main_thread, NULL, run_main, NULL); - return 0; // Success - } else { - return 1; - } -} - - -void -jack_finish(void* arg) -{ - void* ret; - Om::om->quit(); - pthread_join(main_thread, &ret); -} - |