X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dependents.cc;h=ac7c8cfdde5006a8d33f224e889d9c45d7ef66a4;hb=9d9905f443f797efaabb7b8b36217b71e57c6c06;hp=0603fc6baa5acb95ee365736ac18eb2be21734c1;hpb=7ff370e79895d7eb293e7214689b791bd98415fb;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 0603fc6baa..ac7c8cfdde 100644
--- 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 <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,60 +43,95 @@ 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 ("");
+}
+
+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 ();
+	_mixer_on_top = false;
+	flush_pending ();
 }
+
 void
 ARDOUR_UI::goto_mixer_window ()
 {
 	mixer->show_window ();
-	mixer->present();
+	mixer->present ();
+	_mixer_on_top = true;
+	flush_pending ();
+}
+
+void
+ARDOUR_UI::toggle_editor_mixer_on_top ()
+{
+	if (_mixer_on_top) {
+		goto_editor_window ();
+	} else {
+		goto_mixer_window ();
+	}
 }
 
 gint
-ARDOUR_UI::exit_on_main_window_close (GdkEventAny *ev)
+ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
 {
+#ifdef TOP_MENUBAR
+	/* just hide the window, and return - the top menu stays up */
+	editor->hide ();
+	return TRUE;
+#else
+	/* time to get out of here */
 	finish();
 	return TRUE;
+#endif
 }