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/main.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/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 21b03f9a63..3e0d6d4e62 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -417,6 +417,9 @@ int main (int argc, char *argv[]) exit (1); } + if (!keybindings_path.empty()) { + ui->set_keybindings_path (keybindings_path); + } if (!no_splash) { ui->show_splash (); @@ -445,7 +448,7 @@ int main (int argc, char *argv[]) } ui->start_engine (); - + if (maybe_load_session ()) { ui->run (text_receiver); ui = 0; |