fix two major assert failures arising from the optional monitor section commit; separ...

[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 0b6b327e8b343928f82cb69269b92250e50ed642..c55942b4bda74ec78c39f4dfaca75425f6948b45 100644 (file)
--- 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.
 */
@@ -36,7 +40,6 @@
 #include "opts.h"
 #include "i18n.h"
 
-using namespace sigc;
 using namespace Gtk;
 using namespace PBD;
 
@@ -50,7 +53,9 @@ using namespace ARDOUR;
 void
 ARDOUR_UI::shutdown ()
 {
-       ui_config->save_state();
+       if (ui_config->dirty()) {
+               ui_config->save_state();
+       }
 }
 
 void
@@ -59,16 +64,20 @@ ARDOUR_UI::we_have_dependents ()
        install_actions ();
        ProcessorBox::register_actions ();
        keyboard->setup_keybindings ();
-       editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
+       editor->setup_tooltips ();
+       editor->UpdateAllTransportClocks.connect (sigc::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)
 {
        BootMessage (_("Setup Editor"));
-       editor->connect_to_session (s);
+       editor->set_session (s);
        BootMessage (_("Setup Mixer"));
-       mixer->connect_to_session (s);
+       mixer->set_session (s);
 
        /* its safe to do this now */
 
@@ -88,12 +97,11 @@ 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);
+               Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 2000);
        }
 
        editor->show_window ();
        editor->present ();
-       _mixer_on_top = false;
        flush_pending ();
 }
 
@@ -102,17 +110,51 @@ ARDOUR_UI::goto_mixer_window ()
 {
        mixer->show_window ();
        mixer->present ();
-       _mixer_on_top = true;
        flush_pending ();
 }
 
 void
-ARDOUR_UI::toggle_editor_mixer_on_top ()
+ARDOUR_UI::toggle_mixer_window ()
 {
-       if (_mixer_on_top) {
-               goto_editor_window ();
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-mixer"));
+       if (!act) {
+               return;
+       }
+
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+
+       if (tact->get_active()) {
+               goto_mixer_window ();
        } else {
+               mixer->hide ();
+       }
+}
+
+void
+ARDOUR_UI::toggle_mixer_on_top ()
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-mixer-on-top"));
+       if (!act) {
+               return;
+       }
+
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+
+       if (tact->get_active()) {
+
+               /* Toggle the mixer to `visible' if required */
+               act = ActionManager::get_action (X_("Common"), X_("toggle-mixer"));
+               if (act) {
+                       tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+
+                       if (!tact->get_active()) {
+                               tact->set_active ();
+                       }
+               }
+
                goto_mixer_window ();
+       } else {
+               goto_editor_window ();
        }
 }
 
@@ -130,3 +172,4 @@ ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
        return TRUE;
 #endif
 }
+