diff options
author | David Robillard <d@drobilla.net> | 2008-10-12 07:18:39 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-10-12 07:18:39 +0000 |
commit | 8db5a44398dbee8efbf8707ea1cf7c9e9348ebcb (patch) | |
tree | 5682c0524fbcc136a8631d33b89b513b4a2e8e3a /src/ingen/main.cpp | |
parent | d154ae5b114a6a04acd17a83f6d59caa9ec1005a (diff) | |
download | ingen-8db5a44398dbee8efbf8707ea1cf7c9e9348ebcb.tar.gz ingen-8db5a44398dbee8efbf8707ea1cf7c9e9348ebcb.tar.bz2 ingen-8db5a44398dbee8efbf8707ea1cf7c9e9348ebcb.zip |
Add --jack-name command line option (implement feature request #176).
Move queued engine interface and events into separate library (so core engine library doesn't require them).
Remove some cruft.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1654 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ingen/main.cpp')
-rw-r--r-- | src/ingen/main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 4c958606..0b2ed83e 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -77,7 +77,7 @@ main(int argc, char** argv) if (argc <= 1) { cmdline_parser_print_help(); cerr << endl << "*** Ingen requires at least one command line parameter" << endl; - cerr << "*** Just want to use a graphical app? Try 'ingen -eg'" << endl; + cerr << "*** Just want a graphical application? Try 'ingen -eg'" << endl; return 1; } else if (args.connect_given && args.engine_flag) { cerr << "\n*** Nonsense arguments, can't both run a local engine " @@ -109,6 +109,7 @@ main(int argc, char** argv) world->rdf_world->add_prefix("ingen", "http://drobilla.net/ns/ingen#"); world->rdf_world->add_prefix("ingenuity", "http://drobilla.net/ns/ingenuity#"); world->rdf_world->add_prefix("lv2", "http://lv2plug.in/ns/lv2core#"); + world->rdf_world->add_prefix("lv2ev", "http://lv2plug.in/ns/ext/event#"); world->rdf_world->add_prefix("lv2var", "http://lv2plug.in/ns/ext/instance-var#"); world->rdf_world->add_prefix("lv2_midi", "http://lv2plug.in/ns/ext/midi"); world->rdf_world->add_prefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#"); @@ -193,9 +194,11 @@ main(int argc, char** argv) Ingen::JackAudioDriver* (*new_driver)( Ingen::Engine& engine, std::string server_name, + std::string client_name, jack_client_t* jack_client) = NULL; if (engine_jack_module->get_symbol("new_jack_audio_driver", (void*&)new_driver)) - engine->set_driver(DataType::AUDIO, SharedPtr<Driver>(new_driver(*engine, "default", 0))); + engine->set_driver(DataType::AUDIO, SharedPtr<Driver>(new_driver( + *engine, "default", args.jack_name_arg, NULL))); engine->activate(args.parallelism_arg); } |