summaryrefslogtreecommitdiffstats
path: root/src/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-17 10:30:08 +0000
committerDavid Robillard <d@drobilla.net>2011-02-17 10:30:08 +0000
commite668b8c846175f90cf22b456c5e5a4cc85410da4 (patch)
tree613d2e37d4ef359d2f572bfc4bfd43e6acff43c7 /src/ingen
parent4c6269aeaf39f1a5c7473c22ff0417d50decfdc3 (diff)
downloadingen-e668b8c846175f90cf22b456c5e5a4cc85410da4.tar.gz
ingen-e668b8c846175f90cf22b456c5e5a4cc85410da4.tar.bz2
ingen-e668b8c846175f90cf22b456c5e5a4cc85410da4.zip
Jack session support for ingen.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2978 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ingen')
-rw-r--r--src/ingen/main.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index fa638063..0a3129a6 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -108,6 +108,12 @@ main(int argc, char** argv)
Ingen::Shared::World* world = ingen_world_new(&conf, argc, argv);
+#if INGEN_JACK_SESSION
+ if (conf.option("uuid").get_string()) {
+ world->set_jack_uuid(conf.option("uuid").get_string());
+ }
+#endif
+
// Run engine
if (conf.option("engine").get_bool()) {
ingen_try(world->load("ingen_engine"),
@@ -190,7 +196,7 @@ main(int argc, char** argv)
engine_interface->load_plugins();
if (conf.option("gui").get_bool())
engine_interface->get("ingen:plugins");
- world->parser()->parse_document(
+ world->parser()->parse_file(
world, engine_interface.get(), uri, data_path, parent, symbol);
}