UI: Add editor_mixer route pointer to session so all UIs can know the same current_st...

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 6251f77ee7edc55cde5f4a43cca194576e32f8b1..67b33a6c87fd3b8e510e83d342d5bd99b802ac7b 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -42,6 +42,7 @@
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "selection.h"
+#include "ui_config.h"
 
 #include "i18n.h"
 
@@ -77,11 +78,16 @@ Editor::show_editor_mixer (bool yn)
        show_editor_mixer_when_tracks_arrive = false;
 
        if (yn) {
-               Glib::RefPtr<Gdk::Window> win = get_window ();
+               Gtk::Window* toplevel = current_toplevel();
+               Glib::RefPtr<Gdk::Window> win;
                Glib::RefPtr<Gdk::Screen> screen;
-               
+
+               if (toplevel) {
+                       win = toplevel->get_window();
+               }
+
                if (win) {
-                        screen = win->get_screen();
+                       screen = win->get_screen();
                } else {
                        screen = Gdk::Screen::get_default();
                }
@@ -155,13 +161,13 @@ Editor::show_editor_mixer (bool yn)
                }
        }
 
-#ifdef GTKOSX
+#ifdef __APPLE__
        /* XXX gtk problem here */
        ensure_all_elements_drawn();
 #endif
 }
 
-#ifdef GTKOSX
+#ifdef __APPLE__
 void
 Editor::ensure_all_elements_drawn ()
 {
@@ -173,17 +179,15 @@ Editor::ensure_all_elements_drawn ()
 void
 Editor::create_editor_mixer ()
 {
-       current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
-                                             _session,
-                                             false);
+       current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), _session, false);
        current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden));
        current_mixer_strip->WidthChanged.connect (sigc::mem_fun (*this, &Editor::mixer_strip_width_changed));
 
-#ifdef GTKOSX
+#ifdef __APPLE__
        current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn));
 #endif
        current_mixer_strip->set_embedded (true);
-       
+
 }
 
 void
@@ -193,21 +197,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
                return;
        }
 
-       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
-
-       if (act) {
-               Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
-               if (!tact || !tact->get_active()) {
-                       /* not showing mixer strip presently */
-                       return;
-               }
-       }
-
-       if (current_mixer_strip == 0) {
-               create_editor_mixer ();
-       }
-
-
        // if this is an automation track, then we shold the mixer strip should
        // show the parent
 
@@ -236,6 +225,22 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
                }
        }
 
+       _session->set_editor_mixer (route);
+
+       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
+
+       if (act) {
+               Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
+               if (!tact || !tact->get_active()) {
+                       /* not showing mixer strip presently */
+                       return;
+               }
+       }
+
+       if (current_mixer_strip == 0) {
+               create_editor_mixer ();
+       }
+
        if (current_mixer_strip->route() == route) {
                return;
        }
@@ -267,7 +272,7 @@ Editor::maybe_add_mixer_strip_width (XMLNode& node)
 void
 Editor::mixer_strip_width_changed ()
 {
-#ifdef GTKOSX
+#ifdef __APPLE__
        ensure_all_elements_drawn ();
 #endif
 
@@ -283,7 +288,7 @@ Editor::track_mixer_selection ()
 void
 Editor::follow_mixer_selection ()
 {
-       if (!ARDOUR::Config->get_link_editor_and_mixer_selection() || _following_mixer_selection) {
+       if (_following_mixer_selection) {
                return;
        }