diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-12-19 02:41:19 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-12-19 02:41:19 +0000 |
commit | 486020b4032da9bbb20fafd83ec6f10263c892e5 (patch) | |
tree | ec7b4a43e25f628a64ccd56afbca5b556c8f268f /gtk2_ardour/opts.cc | |
parent | 575c7974ebddffe71b1fc673c1463221f134bc16 (diff) |
save keybindings to file used at startup; allow keybindings file to be cmdline-specified; remove some GTK2FIX comments; fix feedback based on john anderson's patch; apply scons patches; fix crash when taking MIDI ports online+offline; try to prevent aborts when shutting down due to metering thread; start work on reconstructing GlobalFOOCommand commands; use ftruncate to hint at peakfile preallocation to reduce fragmentation
git-svn-id: svn://localhost/ardour2/trunk@1223 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/opts.cc')
-rw-r--r-- | gtk2_ardour/opts.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc index fcd62de512..820b346d40 100644 --- a/gtk2_ardour/opts.cc +++ b/gtk2_ardour/opts.cc @@ -37,6 +37,7 @@ 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; @@ -56,7 +57,7 @@ print_help (const char *execname) #endif << _(" [session-name] Name of session to load\n") << _(" -C, --curvetest filename Curve algorithm debugger\n") - << _(" -g, --gtktheme Allow GTK to load a theme\n") + << _(" -k, --keybindings filename Name of key bindings to load (default is ~/.ardour2/ardour.bindings)") ; return 1; @@ -66,7 +67,7 @@ int GTK_ARDOUR::parse_opts (int argc, char *argv[]) { - const char *optstring = "U:hbvVnoc:C:N:g"; + const char *optstring = "U:hbvVnoc:C:N:k:"; const char *execname = strrchr (argv[0], '/'); if (execname == 0) { @@ -85,7 +86,6 @@ GTK_ARDOUR::parse_opts (int argc, char *argv[]) { "new", 1, 0, 'N' }, { "no-hw-optimizations", 0, 0, 'O' }, { "curvetest", 1, 0, 'C' }, - { "gtktheme", 0, 0, 'g' }, { 0, 0, 0, 0 } }; @@ -142,6 +142,10 @@ GTK_ARDOUR::parse_opts (int argc, char *argv[]) curvetest_file = optarg; break; + case 'k': + keybindings_path = optarg; + break; + default: return print_help(execname); } |