From 6fb6e7c581b38a5eb898f2aa3eb6dc5ddb25df1b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 4 May 2007 18:53:43 +0000 Subject: Double Jack initialisation and other cmdline fixes. git-svn-id: http://svn.drobilla.net/lad/ingen@502 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/Engine.cpp | 6 ++++++ src/progs/ingen/main.cpp | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libs/engine/Engine.cpp b/src/libs/engine/Engine.cpp index af26d089..ca813ed0 100644 --- a/src/libs/engine/Engine.cpp +++ b/src/libs/engine/Engine.cpp @@ -142,6 +142,9 @@ Engine::main_iteration() void Engine::start_jack_driver() { + if (_audio_driver) + cerr << "[Engine] Warning: replaced audio driver" << endl; + _audio_driver = SharedPtr(new JackAudioDriver(*this)); } @@ -149,6 +152,9 @@ Engine::start_jack_driver() void Engine::start_osc_driver(int port) { + if (_event_source) + cerr << "[Engine] Warning: replaced event source (engine interface)" << endl; + _event_source = SharedPtr(new OSCEngineReceiver( *this, pre_processor_queue_size, port)); } diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp index 62bc29aa..09deffcc 100644 --- a/src/progs/ingen/main.cpp +++ b/src/progs/ingen/main.cpp @@ -88,7 +88,7 @@ main(int argc, char** argv) Engine* (*new_engine)() = NULL; if (engine_module->get_symbol("new_engine", (void*&)new_engine)) { engine = SharedPtr(new_engine()); - engine->start_jack_driver(); + //engine->start_jack_driver(); //engine->launch_osc_interface(args.engine_port_arg); } else { engine_module.reset(); @@ -106,6 +106,7 @@ main(int argc, char** argv) if (engine) { engine_interface = engine->new_queued_interface(); + engine->start_jack_driver(); engine->activate(); } @@ -197,11 +198,8 @@ main(int argc, char** argv) signal(SIGINT, catch_int); signal(SIGTERM, catch_int); - engine->start_jack_driver(); engine->start_osc_driver(args.engine_port_arg); - engine->activate(); - engine->main(); engine.reset(); -- cgit v1.2.1