X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fopts.cc;h=4437a9d22411cf910d09c3405ea17a6bf53f8931;hb=162c48b84381335ff90fe64b5324467693dee736;hp=820b346d40bf6edc0ce9cbf1fae3a4b3acd7941b;hpb=486020b4032da9bbb20fafd83ec6f10263c892e5;p=ardour.git

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 820b346d40..4437a9d224 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -15,31 +15,34 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <getopt.h>
 #include <iostream>
 #include <cstdlib>
 
+#include "ardour/session.h"
+
 #include "opts.h"
 
 #include "i18n.h"
 
 using namespace std;
 
-string GTK_ARDOUR::session_name = "";
-string GTK_ARDOUR::jack_client_name = "ardour";
-bool  GTK_ARDOUR::show_key_actions = false;
-bool GTK_ARDOUR::no_splash = true;
-bool GTK_ARDOUR::just_version = false;
-bool GTK_ARDOUR::use_vst = true;
-bool GTK_ARDOUR::new_session = false;
-char* GTK_ARDOUR::curvetest_file = 0;
-bool GTK_ARDOUR::try_hw_optimization = true;
-string GTK_ARDOUR::keybindings_path = ""; /* empty means use builtin default */
-
-using namespace GTK_ARDOUR;
+string ARDOUR_COMMAND_LINE::session_name = "";
+string ARDOUR_COMMAND_LINE::jack_client_name = "ardour";
+bool  ARDOUR_COMMAND_LINE::show_key_actions = false;
+bool ARDOUR_COMMAND_LINE::no_splash = true;
+bool ARDOUR_COMMAND_LINE::just_version = false;
+bool ARDOUR_COMMAND_LINE::use_vst = true;
+bool ARDOUR_COMMAND_LINE::new_session = false;
+char* ARDOUR_COMMAND_LINE::curvetest_file = 0;
+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;
+
+using namespace ARDOUR_COMMAND_LINE;
 
 int
 print_help (const char *execname)
@@ -48,28 +51,36 @@ print_help (const char *execname)
 	     << _("  -v, --version                    Show version information\n")
 	     << _("  -h, --help                       Print this message\n")
 	     << _("  -b, --bindings                   Print all possible keyboard binding names\n")
-	     << _("  -n, --show-splash                Show splash screen\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, --use-hw-optimizations        Try to use h/w specific optimizations\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")
 #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)")
+	     << _("  -k, --keybindings filename       Name of key bindings to load (default is ~/.ardour3/ardour.bindings)\n")
 		;
 	return 1;
 
 }
 
 int
-GTK_ARDOUR::parse_opts (int argc, char *argv[])
+ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 
 {
-	const char *optstring = "U:hbvVnoc:C:N:k:";
+	const char *optstring = "U:hSbvVnOdc:C:m:N:k:p:";
 	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 {
@@ -81,10 +92,12 @@ GTK_ARDOUR::parse_opts (int argc, char *argv[])
 		{ "help", 0, 0, 'h' },
 		{ "bindings", 0, 0, 'b' },
 		{ "show-splash", 0, 0, 'n' },
+		{ "menus", 1, 0, 'm' },
 		{ "name", 1, 0, 'c' },
 		{ "novst", 0, 0, 'V' },
 		{ "new", 1, 0, 'N' },
 		{ "no-hw-optimizations", 0, 0, 'O' },
+		{ "sync", 0, 0, 'S' },
 		{ "curvetest", 1, 0, 'C' },
 		{ 0, 0, 0, 0 }
 	};
@@ -114,11 +127,28 @@ GTK_ARDOUR::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 'n':
 			no_splash = false;
 			break;
 
+		case 'p':
+			//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;
+
 		case 'N':
 			new_session = true;
 			session_name = optarg;
@@ -127,7 +157,7 @@ GTK_ARDOUR::parse_opts (int argc, char *argv[])
 		case 'O':
 			try_hw_optimization = false;
 			break;
-
+ 		
 		case 'V':
 #ifdef VST_SUPPORT
 			use_vst = false;