the "final" (??) fixes for transport state stuff before 2.8.4. y'all let me know...

[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 f3b8f976e40f29e0653c4d8c4068dce719b83b87..36d2154c46050c2e2c76c58305418b83d0639a8d 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -23,8 +23,6 @@
 
 #include <cstdio>
 
-#include <gtkmm/accelmap.h>
-
 #include <pbd/error.h>
 
 #include "ardour_ui.h"
@@ -33,6 +31,7 @@
 #include "keyboard.h"
 #include "splash.h"
 #include "route_params_ui.h"
+#include "opts.h"
 #include "i18n.h"
 
 using namespace sigc;
@@ -44,6 +43,8 @@ namespace ARDOUR {
        class Route;
 }
 
+using namespace ARDOUR;
+
 void
 ARDOUR_UI::shutdown ()
 {
@@ -58,53 +59,26 @@ ARDOUR_UI::shutdown ()
 
 void
 ARDOUR_UI::we_have_dependents ()
-{
-       setup_keybindings ();
-       editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
-}
-
-static void 
-accel_map_changed (GtkAccelMap* map,
-                  gchar* path,
-                  guint  key,
-                  GdkModifierType mod,
-                  gpointer arg)
-{
-       static_cast<ARDOUR_UI*>(arg)->save_keybindings ();
-}
-
-void
-ARDOUR_UI::setup_keybindings ()
 {
        install_actions ();
        RedirectBox::register_actions ();
-       
-       cerr << "loading bindings from " << keybindings_path << endl;
 
-       try {
-               AccelMap::load (keybindings_path);
-       } catch (...) {
-               error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), keybindings_path)
-                     << endmsg;
-       }
-
-       /* catch changes */
-
-       GtkAccelMap* accelmap = gtk_accel_map_get();
-       g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this);
-
-       
+       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 ("");
 }
 
@@ -125,6 +99,7 @@ ARDOUR_UI::goto_editor_window ()
 
        editor->show_window ();
        editor->present();
+       _mixer_on_top = false;
        flush_pending ();
 }
 
@@ -133,12 +108,30 @@ 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 ();
+       }
+}
+
 gint
 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
 }