use new action map API instead of ActionManager::get_action

[ardour.git] / gtk2_ardour / opts.cc

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 14db98de02b4b9e1bfcf1d3d207c6b763effb5af..d0657abe8b69c2a3755316adec9ef9e27bdccc24 100644 (file)
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -39,6 +39,7 @@ string ARDOUR_COMMAND_LINE::session_name = "";
 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::show_actions = false;
 bool ARDOUR_COMMAND_LINE::no_splash = false;
 bool ARDOUR_COMMAND_LINE::just_version = false;
 bool ARDOUR_COMMAND_LINE::use_vst = true;
@@ -67,7 +68,8 @@ print_help (const char *execname)
                << "\n\n"
                << _("Options:\n")
                << _("  -a, --no-announcements      Do not contact website for announcements\n")
-               << _("  -b, --actions               Print all possible menu action names\n")
+               << _("  -A, --actions               Print all possible menu action names\n")
+               << _("  -b, --bindings              Display all current key bindings\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")
 #ifndef NDEBUG
@@ -86,9 +88,9 @@ print_help (const char *execname)
                << _("  -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")
-               << _("  -T, --template <name>       Draw the GUI synchronously\n")
+               << _("  -T, --template <name>       Use given template for new session\n")
                << _("  -U, --uuid <uuid>           Set (jack) backend UUID\n")
-               << _("  -v, --version               Use session template\n")
+               << _("  -v, --version               Print version and exit\n")
 #ifdef WINDOWS_VST_SUPPORT
                << _("  -V, --novst                 Disable WindowsVST support\n")
 #endif
@@ -103,7 +105,7 @@ print_help (const char *execname)
 int
 ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 {
-       const char *optstring = "abBc:C:dD:hHk:E:m:N:nOp:PST:U:vV";
+       const char *optstring = "aAbBc:C:dD:hHk:E:m:N:nOp:PST:U:vV";
        const char *execname = strrchr (argv[0], '/');
 
        if (execname == 0) {
@@ -116,7 +118,8 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
                { "version", 0, 0, 'v' },
                { "help", 0, 0, 'h' },
                { "no-announcements", 0, 0, 'a' },
-               { "actions", 0, 0, 'b' },
+               { "actions", 0, 0, 'A' },
+               { "bindings", 0, 0, 'b' },
                { "bypass-plugins", 0, 0, 'B' },
                { "disable-plugins", 0, 0, 'd' },
                { "debug", 1, 0, 'D' },
@@ -166,6 +169,10 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
                        check_announcements = false;
                        break;
 
+               case 'A':
+                       show_actions = true;
+                       break;
+
                case 'b':
                        show_key_actions = true;
                        break;