X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fopts.cc;h=98e72de7884235c3062e3e72868ff132d82c7c0d;hb=6424a0eab93c85f8b1ff56334f779c1232dfe475;hp=b29f106bfeedfdfa104c90aadbf91dd406928fd4;hpb=55a10480945f2a41fe6cfda2173bed12d3d5bc89;p=ardour.git

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index b29f106bfe..98e72de788 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -25,14 +25,19 @@
 #include "ardour/debug.h"
 #include "ardour/session.h"
 
+#ifndef NDEBUG // "-H"
+#include "processor_box.h"
+#endif
+
 #include "opts.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 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,7 +50,6 @@ 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;
 
@@ -60,7 +64,8 @@ print_help (const char *execname)
 	     << _("  -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")
+	     << _("  -B, --bypass-plugins        Bypass all plugins in an existing session\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")
@@ -74,7 +79,7 @@ print_help (const char *execname)
 #endif
 	     << _("  -E, --save <file>           Load the specified session, save it to <file> 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")
+	     << _("  -k, --keybindings filename  Name of key bindings to load\n")
 		;
 	return 1;
 
@@ -83,14 +88,9 @@ print_help (const char *execname)
 int
 ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 {
-	const char *optstring = "abc:C:dD:hk:E:m:N:nOp:PST:U:vV";
+	const char *optstring = "abBc:C:dD:hHk:E:m:N:nOp:PST:U:vV";
 	const char *execname = strrchr (argv[0], '/');
 
-	if (getenv ("ARDOUR_SAE")) {
-		menus_file = "ardour-sae.menus";
-		keybindings_path = "SAE";
-	}
-
 	if (execname == 0) {
 		execname = argv[0];
 	} else {
@@ -102,7 +102,8 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 		{ "help", 0, 0, 'h' },
 		{ "no-announcements", 0, 0, 'a' },
 		{ "bindings", 0, 0, 'b' },
-		{ "disable-plugins", 1, 0, 'd' },
+		{ "bypass-plugins", 0, 0, 'B' },
+		{ "disable-plugins", 0, 0, 'd' },
 		{ "debug", 1, 0, 'D' },
 		{ "no-splash", 0, 0, 'n' },
 		{ "menus", 1, 0, 'm' },
@@ -141,6 +142,11 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			print_help (execname);
 			exit (0);
 			break;
+		case 'H':
+#ifndef NDEBUG
+			ProcessorBox::show_all_processors = true;
+#endif
+			break;
 		case 'a':
 			check_announcements = false;
 			break;
@@ -149,6 +155,10 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			show_key_actions = true;
 			break;
 
+		case 'B':
+			ARDOUR::Session::set_bypass_all_loaded_plugins (true);
+			break;
+
 		case 'd':
 			ARDOUR::Session::set_disable_all_loaded_plugins (true);
 			break;
@@ -199,7 +209,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			break;
 
 		case 'c':
-			jack_client_name = optarg;
+			backend_client_name = optarg;
 			break;
 
 		case 'C':
@@ -215,7 +225,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			break;
 
 		case 'U':
-			jack_session_uuid = optarg;
+			backend_session_uuid = optarg;
                         break;
 
 		default: