X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fopts.cc;h=1392cb3f4829ba40c90acfe5a251aa06cbc3fda6;hb=78b8eaf565a34df551bcac2b839a9defe9681ea0;hp=00aa5cf94e723e1f52568512b37926f06677adec;hpb=bb457bb960c5bd7ed538f9d31477293415739f68;p=ardour.git diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc index 00aa5cf94e..1392cb3f48 100644 --- a/gtk2_ardour/opts.cc +++ b/gtk2_ardour/opts.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2001 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,10 +18,12 @@ */ #include +#include #include #include -#include +#include "ardour/debug.h" +#include "ardour/session.h" #include "opts.h" @@ -41,29 +43,33 @@ bool ARDOUR_COMMAND_LINE::try_hw_optimization = true; string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */ Glib::ustring ARDOUR_COMMAND_LINE::menus_file = "ardour.menus"; bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false; +string ARDOUR_COMMAND_LINE::immediate_save; +string ARDOUR_COMMAND_LINE::jack_session_uuid; using namespace ARDOUR_COMMAND_LINE; int print_help (const char *execname) { - cout << _("Usage: ") << execname << "\n" - << _(" -v, --version Show version information\n") - << _(" -h, --help Print this message\n") - << _(" -b, --bindings Print all possible keyboard binding names\n") - << _(" -c, --name name Use a specific jack client name, default is ardour\n") - << _(" -d, --disable-plugins Disable all plugins in an existing session\n") - << _(" -n, --show-splash Show splash screen\n") - << _(" -m, --menus file Use \"file\" for Ardour menus\n") - << _(" -N, --new session-name Create a new session from the command line\n") - << _(" -O, --no-hw-optimizations Disable h/w specific optimizations\n") - << _(" -S, --sync Draw the gui synchronously \n") + cout << _("Usage: ") << execname << " [OPTION]... [SESSION_NAME]\n\n" + << _(" [SESSION_NAME] Name of session to load\n") + << _(" -v, --version Show version information\n") + << _(" -h, --help Print this message\n") + << _(" -b, --bindings Print all possible keyboard binding names\n") + << _(" -c, --name Use a specific jack client name, default is ardour\n") + << _(" -d, --disable-plugins Disable all plugins in an existing session\n") + << _(" -D, --debug Set debug flags. Use \"-D list\" to see available options\n") + << _(" -n, --show-splash Show splash screen\n") + << _(" -m, --menus file Use \"file\" to define menus\n") + << _(" -N, --new session-name Create a new session from the command line\n") + << _(" -O, --no-hw-optimizations Disable h/w specific optimizations\n") + << _(" -S, --sync Draw the gui synchronously \n") #ifdef VST_SUPPORT - << _(" -V, --novst Do not use VST support\n") + << _(" -V, --novst Do not use VST support\n") #endif - << _(" [session-name] Name of session to load\n") - << _(" -C, --curvetest filename Curve algorithm debugger\n") - << _(" -k, --keybindings filename Name of key bindings to load (default is ~/.ardour2/ardour.bindings)\n") + << _(" -E, --save Load the specified session, save it to and then quit\n") + << _(" -C, --curvetest filename Curve algorithm debugger\n") + << _(" -k, --keybindings filename Name of key bindings to load (default is ~/.ardour3/ardour.bindings)\n") ; return 1; @@ -71,14 +77,13 @@ print_help (const char *execname) int ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) - { - const char *optstring = "U:hSbvVnOdc:C:m:N:k:p:"; + const char *optstring = "bc:C:dD:hk:E:m:N:nOp:SU:vV"; const char *execname = strrchr (argv[0], '/'); if (getenv ("ARDOUR_SAE")) { menus_file = "ardour-sae.menus"; - keybindings_path = "ardour-sae"; + keybindings_path = "SAE"; } if (execname == 0) { @@ -91,6 +96,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) { "version", 0, 0, 'v' }, { "help", 0, 0, 'h' }, { "bindings", 0, 0, 'b' }, + { "debug", 1, 0, 'D' }, { "show-splash", 0, 0, 'n' }, { "menus", 1, 0, 'm' }, { "name", 1, 0, 'c' }, @@ -99,6 +105,8 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) { "no-hw-optimizations", 0, 0, 'O' }, { "sync", 0, 0, 'S' }, { "curvetest", 1, 0, 'C' }, + { "save", 1, 0, 'E' }, + { "uuid", 1, 0, 'U' }, { 0, 0, 0, 0 } }; @@ -115,7 +123,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) switch (c) { case 0: break; - + case 'v': just_version = true; break; @@ -127,15 +135,20 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) case 'b': show_key_actions = true; break; - + case 'd': ARDOUR::Session::set_disable_all_loaded_plugins (true); break; - - case 'm': - menus_file = optarg; - break; + case 'D': + if (PBD::parse_debug_options (optarg)) { + exit (0); + } + break; + + case 'm': + menus_file = optarg; + break; case 'n': no_splash = false; @@ -145,7 +158,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) //undocumented OS X finder -psn_XXXXX argument finder_invoked_ardour = true; break; - + case 'S': // ; just pass this through to gtk it will figure it out break; @@ -158,7 +171,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) case 'O': try_hw_optimization = false; break; - + case 'V': #ifdef VST_SUPPORT use_vst = false; @@ -177,6 +190,13 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) keybindings_path = optarg; break; + case 'E': + immediate_save = optarg; + break; + + case 'U': + jack_session_uuid = optarg; + default: return print_help(execname); } @@ -190,7 +210,6 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[]) session_name = argv[optind++]; } - return 0; }