* fixed segfault on MIDI Panic button

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index bf096f86c1a729728c1dd4eeb0f66e6c2fb63e76..f81dc8d311bf90302ad5d5827edc22682202f499 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 /* this file exists solely to break compilation dependencies that
@@ -24,14 +23,15 @@
 
 #include <cstdio>
 
-#include <gtkmm/accelmap.h>
-
 #include <pbd/error.h>
+
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
+#include "splash.h"
 #include "route_params_ui.h"
+#include "opts.h"
 #include "i18n.h"
 
 using namespace sigc;
@@ -43,59 +43,71 @@ namespace ARDOUR {
        class Route;
 }
 
+using namespace ARDOUR;
+
 void
 ARDOUR_UI::shutdown ()
 {
        if (session) {
-               delete session;
+               /* we're exiting cleanly, so remove any auto-save data */
+               session->remove_pending_capture_state ();
                session = 0;
        }
 
+       ui_config->save_state();
 }
 
 void
 ARDOUR_UI::we_have_dependents ()
-{
-       setup_keybindings ();
-}
-
-void
-ARDOUR_UI::setup_keybindings ()
 {
        install_actions ();
-       RedirectBox::register_actions ();
-       
-       std::string key_binding_file = ARDOUR::find_config_file("ardour.bindings");
+       ProcessorBox::register_actions ();
 
-       try {
-               AccelMap::load (key_binding_file);
-       } catch (...) {
-               error << "ardour key bindings file not found" << endmsg;
-       }
+       Keyboard::setup_keybindings ();
+
+       editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 }
 
 void
 ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
+       BootMessage (_("Setup Editor"));
        editor->connect_to_session (s);
+       BootMessage (_("Setup Mixer"));
        mixer->connect_to_session (s);
 
        /* its safe to do this now */
+       
+       BootMessage (_("Reload Session History"));
+       s->restore_history ("");
+}
 
-       s->restore_history (s->snap_name());
+static bool
+_hide_splash (gpointer arg)
+{
+       ((ARDOUR_UI*)arg)->hide_splash();
+       return false;
 }
 
 void
 ARDOUR_UI::goto_editor_window ()
 {
+       if (splash && splash->is_visible()) {
+               // in 2 seconds, hide the splash screen 
+               Glib::signal_timeout().connect (bind (sigc::ptr_fun (_hide_splash), this), 2000);
+       }
+
        editor->show_window ();
-       editor->present();
+       editor->present ();
+       flush_pending ();
 }
+
 void
 ARDOUR_UI::goto_mixer_window ()
 {
        mixer->show_window ();
-       mixer->present();
+       mixer->present ();
+       flush_pending ();
 }
 
 gint