X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dependents.cc;h=c27ade9fedfd4bd9d3ac6cc537c20cd9946a8c55;hb=364022a35a798d4819fea149e2393f73297af3f6;hp=6755b27d1e9abbc99469dfdfd988028f2d460bf8;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 6755b27d1e..c27ade9fed 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 /* this file exists solely to break compilation dependencies that
    would connect changes to the mixer or editor objects.
 */
@@ -25,6 +29,9 @@
 
 #include "pbd/error.h"
 
+#include "ardour/session.h"
+
+#include "actions.h"
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "mixer_ui.h"
@@ -34,7 +41,6 @@
 #include "opts.h"
 #include "i18n.h"
 
-using namespace sigc;
 using namespace Gtk;
 using namespace PBD;
 
@@ -45,36 +51,33 @@ namespace ARDOUR {
 
 using namespace ARDOUR;
 
-void
-ARDOUR_UI::shutdown ()
-{
-	if (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 ()
 {
 	install_actions ();
 	ProcessorBox::register_actions ();
+	keyboard->setup_keybindings ();
+	editor->setup_tooltips ();
+	editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
+
+	/* all actions are defined */
 
-	Keyboard::setup_keybindings ();
+	ActionManager::enable_accelerators ();
+	ActionManager::load_menus (ARDOUR_COMMAND_LINE::menus_file);
 
-	editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
+	editor->track_mixer_selection ();
+	mixer->track_editor_selection ();
 }
 
 void
 ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
+	DisplaySuspender ds;
 	BootMessage (_("Setup Editor"));
-	editor->connect_to_session (s);
+	editor->set_session (s);
 	BootMessage (_("Setup Mixer"));
-	mixer->connect_to_session (s);
+	mixer->set_session (s);
+	meterbridge->set_session (s);
 
 	/* its safe to do this now */
 
@@ -82,46 +85,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 	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 ();
-	_mixer_on_top = false;
-	flush_pending ();
-}
-
-void
-ARDOUR_UI::goto_mixer_window ()
-{
-	mixer->show_window ();
-	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 ();
-	}
-}
-
+/** The main editor window has been closed */
 gint
 ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
 {
@@ -135,3 +99,4 @@ ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
 	return TRUE;
 #endif
 }
+