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/ardour_ui.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/ardour_ui.cc')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index e369c85261..4680514771 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -164,6 +164,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) _will_create_new_session_automatically = false; session_loaded = false; last_speed_displayed = -1.0f; + keybindings_path = ARDOUR::find_config_file ("ardour.bindings"); last_configure_time.tv_sec = 0; last_configure_time.tv_usec = 0; @@ -345,9 +346,7 @@ ARDOUR_UI::save_ardour_state () Config->add_instant_xml (mnode, get_user_ardour_path()); } - /* keybindings */ - - AccelMap::save ("ardour.saved_bindings"); + save_keybindings (); } void @@ -382,6 +381,9 @@ If you still wish to quit, please use the\n\n\ } } + if (session) { + session->set_deletion_in_progress (); + } engine->stop (true); Config->save_state(); quit (); @@ -2412,3 +2414,15 @@ ARDOUR_UI::record_state_changed () break; } } + +void +ARDOUR_UI::set_keybindings_path (string path) +{ + keybindings_path = path; +} + +void +ARDOUR_UI::save_keybindings () +{ + AccelMap::save (keybindings_path); +} |