summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-05-04 19:25:37 +0000
committerDavid Robillard <d@drobilla.net>2007-05-04 19:25:37 +0000
commit8c64f52e72b42c8db74fd8a8be0737ffaa0df640 (patch)
tree932e9406cfa5a2eb25cd0edd219df2ea5e45b869 /src
parentd3a24215b3c8a1bd9878cdd19442601ad0f63431 (diff)
downloadingen-8c64f52e72b42c8db74fd8a8be0737ffaa0df640.tar.gz
ingen-8c64f52e72b42c8db74fd8a8be0737ffaa0df640.tar.bz2
ingen-8c64f52e72b42c8db74fd8a8be0737ffaa0df640.zip
Fixed engine OSC listening (and GUI connecting).
git-svn-id: http://svn.drobilla.net/lad/ingen@504 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/progs/ingen/main.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp
index 09deffcc..354cfcd6 100644
--- a/src/progs/ingen/main.cpp
+++ b/src/progs/ingen/main.cpp
@@ -89,7 +89,7 @@ main(int argc, char** argv)
if (engine_module->get_symbol("new_engine", (void*&)new_engine)) {
engine = SharedPtr<Engine>(new_engine());
//engine->start_jack_driver();
- //engine->launch_osc_interface(args.engine_port_arg);
+ //engine->start_osc_driver(args.engine_port_arg);
} else {
engine_module.reset();
}
@@ -103,12 +103,6 @@ main(int argc, char** argv)
}
}
-
- if (engine) {
- engine_interface = engine->new_queued_interface();
- engine->start_jack_driver();
- engine->activate();
- }
/* Connect to remote engine */
@@ -128,11 +122,18 @@ main(int argc, char** argv)
return -1;
}
}
+
+
+ if (engine) {
+ engine->start_jack_driver();
+ engine->start_osc_driver(args.engine_port_arg);
+ engine->activate();
+ }
/* Load a patch */
if (args.load_given && engine_interface) {
-
+
Raul::RDF::World rdf_world;
rdf_world.add_prefix("xsd", "http://www.w3.org/2001/XMLSchema#");
rdf_world.add_prefix("ingen", "http://drobilla.net/ns/ingen#");
@@ -192,16 +193,19 @@ main(int argc, char** argv)
}
- /* Didn't run the GUI, do our own main thing. */
+ /* Didn't run the GUI, listen to OSC and do our own main thing. */
if (engine && !ran_gui) {
signal(SIGINT, catch_int);
signal(SIGTERM, catch_int);
- engine->start_osc_driver(args.engine_port_arg);
+ //engine->start_osc_driver(args.engine_port_arg);
+ engine->activate();
engine->main();
+ cout << "Exiting." << endl;
+
engine.reset();
}