X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mixer.cc;h=0c0348383f2a577a3423dc9144acbbc63eec6476;hb=167b9dda37135d6172e751ba89302bbd66ea882e;hp=9769d616fe7e6692563c99f46975e735347b202f;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 9769d616fe..0c0348383f 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -30,6 +30,8 @@
 
 #include "ardour/rc_configuration.h"
 
+#include "control_protocol/control_protocol.h"
+
 #include "actions.h"
 #include "ardour_ui.h"
 #include "audio_time_axis.h"
@@ -44,7 +46,7 @@
 #include "selection.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtkmm2ext;
@@ -78,11 +80,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();
 		}
@@ -156,13 +163,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 ()
 {
@@ -174,13 +181,11 @@ 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);
@@ -194,21 +199,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
 
@@ -237,6 +227,26 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 		}
 	}
 
+	/* Typically this is set by changing the TAV selection but if for any
+	   reason we decide to show a different strip for some reason, make
+	   sure that control surfaces can find it.
+	*/
+	ARDOUR::ControlProtocol::set_first_selected_stripable (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;
 	}
@@ -268,7 +278,7 @@ Editor::maybe_add_mixer_strip_width (XMLNode& node)
 void
 Editor::mixer_strip_width_changed ()
 {
-#ifdef GTKOSX
+#ifdef __APPLE__
 	ensure_all_elements_drawn ();
 #endif
 
@@ -291,12 +301,12 @@ Editor::follow_mixer_selection ()
 	_following_mixer_selection = true;
 	selection->block_tracks_changed (true);
 
-	RouteUISelection& s (Mixer_UI::instance()->selection().routes);
+	AxisViewSelection& s (Mixer_UI::instance()->selection().axes);
 
 	selection->clear_tracks ();
 
-	for (RouteUISelection::iterator i = s.begin(); i != s.end(); ++i) {
-		TimeAxisView* tav = get_route_view_by_route_id ((*i)->route()->id());
+	for (AxisViewSelection::iterator i = s.begin(); i != s.end(); ++i) {
+		TimeAxisView* tav = axis_view_from_stripable ((*i)->stripable());
 		if (tav) {
 			selection->add (tav);
 		}