X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=2d33b54af358a312f2532ed75571bdcd4766991a;hb=d8425b4a0fc1a875a3f1fdff62e222386ce3f1b4;hp=b74455b28d77c4231128bb659ff36caf87b79a7e;hpb=7d32cf3813b7145b98c86b59867092e04aa2621a;p=ardour.git

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index b74455b28d..2d33b54af3 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include <boost/foreach.hpp>
+
 #include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "mixer_group_tabs.h"
@@ -87,7 +89,7 @@ MixerGroupTabs::compute_tabs () const
 void
 MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
-	double const arc_radius = _height;
+	double const arc_radius = get_height();
 
 	if (tab.group && tab.group->is_active()) {
 		cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1);
@@ -95,10 +97,10 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 		cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
 	}
 
-	cairo_arc (cr, tab.from + arc_radius, _height, arc_radius, M_PI, 3 * M_PI / 2);
+	cairo_arc (cr, tab.from + arc_radius, get_height(), arc_radius, M_PI, 3 * M_PI / 2);
 	cairo_line_to (cr, tab.to - arc_radius, 0);
-	cairo_arc (cr, tab.to - arc_radius, _height, arc_radius, 3 * M_PI / 2, 2 * M_PI);
-	cairo_line_to (cr, tab.from, _height);
+	cairo_arc (cr, tab.to - arc_radius, get_height(), arc_radius, 3 * M_PI / 2, 2 * M_PI);
+	cairo_line_to (cr, tab.from, get_height());
 	cairo_fill (cr);
 
 	if (tab.group) {
@@ -108,7 +110,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 		cairo_text_extents (cr, tab.group->name().c_str(), &ext);
 
 		cairo_set_source_rgb (cr, 1, 1, 1);
-		cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, _height - ext.height / 2);
+		cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, get_height() - ext.height / 2);
 		cairo_save (cr);
 		cairo_show_text (cr, f.first.c_str());
 		cairo_restore (cr);
@@ -176,7 +178,14 @@ MixerGroupTabs::order_key () const
 RouteList
 MixerGroupTabs::selected_routes () const
 {
-	return _mixer->selection().routes;
+	RouteList rl;
+	BOOST_FOREACH (RouteUI* r, _mixer->selection().routes) {
+		boost::shared_ptr<Route> rp = r->route();
+		if (rp) {
+			rl.push_back (rp);
+		}
+	}
+	return rl;
 }
 
 void