X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fopts.cc;h=4596b5c62cb3fccc7cf10331e943b3e3c1483987;hb=ed1bbefd193be8a21eb4436442ee7acf49c858a2;hp=efb64729fc77abcb831a3c4c3d6a14e396ce7c21;hpb=c7427287c1a2c04e56d50131dd8bcae83530c810;p=ardour.git

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index efb64729fc..4596b5c62c 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -32,7 +32,8 @@
 using namespace std;
 
 string ARDOUR_COMMAND_LINE::session_name = "";
-string ARDOUR_COMMAND_LINE::jack_client_name = "ardour";
+string ARDOUR_COMMAND_LINE::backend_client_name = "ardour";
+string ARDOUR_COMMAND_LINE::backend_session_uuid;
 bool  ARDOUR_COMMAND_LINE::show_key_actions = false;
 bool ARDOUR_COMMAND_LINE::no_splash = false;
 bool ARDOUR_COMMAND_LINE::just_version = false;
@@ -45,8 +46,8 @@ string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin de
 std::string 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;
 string ARDOUR_COMMAND_LINE::load_template;
+bool ARDOUR_COMMAND_LINE::check_announcements = true;
 
 using namespace ARDOUR_COMMAND_LINE;
 
@@ -57,14 +58,16 @@ print_help (const char *execname)
 	     << _("  [SESSION_NAME]              Name of session to load\n")
 	     << _("  -v, --version               Show version information\n")
 	     << _("  -h, --help                  Print this message\n")
+	     << _("  -a, --no-announcements      Do not contact website for announcements\n")
 	     << _("  -b, --bindings              Print all possible keyboard binding names\n")
-	     << _("  -c, --name <name>           Use a specific jack client name, default is ardour\n")
+	     << _("  -c, --name <name>           Use a specific backend client name, default is ardour\n")
 	     << _("  -d, --disable-plugins       Disable all plugins in an existing session\n")
 	     << _("  -D, --debug <options>       Set debug flags. Use \"-D list\" to see available options\n")
 	     << _("  -n, --no-splash             Do not 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")
+	     << _("  -P, --no-connect-ports      Do not connect any ports at startup\n")
 	     << _("  -S, --sync                  Draw the gui synchronously \n")
 #ifdef WINDOWS_VST_SUPPORT
 	     << _("  -V, --novst                 Do not use VST support\n")
@@ -80,7 +83,7 @@ print_help (const char *execname)
 int
 ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 {
-	const char *optstring = "bc:C:dD:hk:E:m:N:nOp:PST:U:vV";
+	const char *optstring = "abc:C:dD:hk:E:m:N:nOp:PST:U:vV";
 	const char *execname = strrchr (argv[0], '/');
 
 	if (getenv ("ARDOUR_SAE")) {
@@ -97,9 +100,11 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 	const struct option longopts[] = {
 		{ "version", 0, 0, 'v' },
 		{ "help", 0, 0, 'h' },
+		{ "no-announcements", 0, 0, 'a' },
 		{ "bindings", 0, 0, 'b' },
+		{ "disable-plugins", 0, 0, 'd' },
 		{ "debug", 1, 0, 'D' },
-		{ "show-splash", 0, 0, 'n' },
+		{ "no-splash", 0, 0, 'n' },
 		{ "menus", 1, 0, 'm' },
 		{ "name", 1, 0, 'c' },
 		{ "novst", 0, 0, 'V' },
@@ -136,6 +141,10 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			print_help (execname);
 			exit (0);
 			break;
+		case 'a':
+			check_announcements = false;
+			break;
+
 		case 'b':
 			show_key_actions = true;
 			break;
@@ -190,7 +199,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			break;
 
 		case 'c':
-			jack_client_name = optarg;
+			backend_client_name = optarg;
 			break;
 
 		case 'C':
@@ -206,7 +215,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			break;
 
 		case 'U':
-			jack_session_uuid = optarg;
+			backend_session_uuid = optarg;
                         break;
 
 		default: