LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made OmApp a singleton 

git-svn-id: http://svn.drobilla.net/lad@95 a436a847-0d15-0410-975c-d299462d15a1
This commit is contained in:
dave 2006-07-18 05:22:07 +00:00
parent 246f424207
commit 39d419b12a
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ingen/src/libs/engine/OmApp.cpp
View File

@ -14,8 +14,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "Om.h"
#include "OmApp.h"
#include "Ingen.h"
#include "config.h"
#include "tuning.h"
#include <sys/mman.h>
@ -50,7 +49,18 @@ using std::cout; using std::cerr; using std::endl;
namespace Om {
OmApp::OmApp(const char* port, AudioDriver* audio_driver)
Ingen::m_instance = NULL;
static void
Ingen::instantiate(const char* port, AudioDriver* audio_driver = 0)
{
assert(!m_instance);
m_instance = new Ingen(port, audio_driver);
}
Ingen::Ingen(const char* port, AudioDriver* audio_driver)
: m_audio_driver( (audio_driver) ? audio_driver : new JackAudioDriver() ),
m_osc_receiver(new OSCReceiver(pre_processor_queue_size, port)),
#ifdef HAVE_JACK_MIDI
@ -77,7 +87,7 @@ OmApp::OmApp(const char* port, AudioDriver* audio_driver)
}
OmApp::~OmApp()
Ingen::~Ingen()
{
deactivate();
@ -107,13 +117,13 @@ OmApp::~OmApp()
* more elegant and extensible, but this is faster and simpler - for now.
*/
template<>
Driver<MidiMessage>* OmApp::driver<MidiMessage>() { return m_midi_driver; }
Driver<MidiMessage>* Ingen::driver<MidiMessage>() { return m_midi_driver; }
template<>
Driver<sample>* OmApp::driver<sample>() { return m_audio_driver; }
Driver<Sample>* Ingen::driver<Sample>() { return m_audio_driver; }
int
OmApp::main()
Ingen::main()
{
// Loop until quit flag is set (by OSCReceiver)
while ( ! m_quit_flag) {
@ -139,7 +149,7 @@ OmApp::main()
void
OmApp::activate()
Ingen::activate()
{
if (m_activated)
return;
@ -168,7 +178,7 @@ OmApp::activate()
void
OmApp::deactivate()
Ingen::deactivate()
{
if (!m_activated)
return;