summaryrefslogtreecommitdiffstats
path: root/src/progs/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-05-04 18:53:43 +0000
committerDavid Robillard <d@drobilla.net>2007-05-04 18:53:43 +0000
commit6fb6e7c581b38a5eb898f2aa3eb6dc5ddb25df1b (patch)
tree92c15f3ab472f0597f67967806cb6ee3377a493b /src/progs/ingen
parent673e4864318ca6c4700cca8402f2fea9bfda53d4 (diff)
downloadingen-6fb6e7c581b38a5eb898f2aa3eb6dc5ddb25df1b.tar.gz
ingen-6fb6e7c581b38a5eb898f2aa3eb6dc5ddb25df1b.tar.bz2
ingen-6fb6e7c581b38a5eb898f2aa3eb6dc5ddb25df1b.zip
Double Jack initialisation and other cmdline fixes.
git-svn-id: http://svn.drobilla.net/lad/ingen@502 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/ingen')
-rw-r--r--src/progs/ingen/main.cpp6
1 files changed, 2 insertions, 4 deletions
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<Engine>(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();