Fix method hiding in Canvas::Text

[ardour.git] / gtk2_ardour / opts.cc

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 3be412c56a9c8c93386d43a016503aa6d761e7d5..4596b5c62cb3fccc7cf10331e943b3e3c1483987 100644 (file)
--- 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,7 +46,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,13 +60,14 @@ 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")
+            << _("  -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")
@@ -101,7 +102,7 @@ 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' },
+               { "disable-plugins", 0, 0, 'd' },
                { "debug", 1, 0, 'D' },
                { "no-splash", 0, 0, 'n' },
                { "menus", 1, 0, 'm' },
@@ -198,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':
@@ -214,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: