X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=e235bf16cc1587cf8327b3c3da1c18777dd50508;hb=d5f150b51b3027b9853c56139ffa75b0520ceeca;hp=7d8bb99b481ce2687ec1dd6bc7b6093470e93fcf;hpb=6b019a495359909a3d1a778ca10cd7df7cc302cc;p=ardour.git

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 7d8bb99b48..e235bf16cc 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -33,7 +33,7 @@
 #include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -61,11 +61,21 @@ MixerGroupTabs::compute_tabs () const
 	TreeModel::Children rows = _mixer->track_model->children ();
 	for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
 
-		MixerStrip* s = (*i)[_mixer->track_columns.strip];
+		AxisView* av = (*i)[_mixer->stripable_columns.strip];
+		MixerStrip* s = dynamic_cast<MixerStrip*> (av);
+
+		if (!s) {
+			continue;
+		}
 
 		if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
 			continue;
 		}
+#ifdef MIXBUS
+		if (s->route()->mixbus()) {
+			continue;
+		}
+#endif
 
 		RouteGroup* g = s->route_group ();
 
@@ -83,7 +93,9 @@ MixerGroupTabs::compute_tabs () const
 			}
 		}
 
-		x += s->get_width ();
+		int ww = 0, wh = 0;
+		s->get_size_request (ww, wh); // widget may not be realized, get_width() is invalid.
+		x += ww;
 	}
 
 	if (tab.group) {
@@ -99,13 +111,13 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
 	double const arc_radius = get_height();
 	double r, g, b, a;
-	
+
 	if (tab.group && tab.group->is_active()) {
 		ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
 	} else {
 		ArdourCanvas::color_to_rgba (UIConfiguration::instance().color ("inactive group tab"), r, g, b, a);
 	}
-	
+
 	a = 1.0;
 
 	cairo_set_source_rgba (cr, r, g, b, a);
@@ -120,7 +132,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 
 		cairo_text_extents_t ext;
 		cairo_text_extents (cr, tab.group->name().c_str(), &ext);
-		
+
 		ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
 		ArdourCanvas::color_to_rgba (c, r, g, b, a);
 
@@ -147,11 +159,16 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
 	TreeModel::Children rows = _mixer->track_model->children ();
 	for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
 
-		MixerStrip* s = (*i)[_mixer->track_columns.strip];
+		AxisView* av = (*i)[_mixer->stripable_columns.strip];
+		MixerStrip* s = dynamic_cast<MixerStrip*> (av);
 
-	 	if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
-	 		continue;
-	 	}
+		if (!s) {
+			continue;
+		}
+
+		if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
+			continue;
+		}
 
 		if (x >= t->to) {
 			/* tab finishes before this track starts */
@@ -174,8 +191,8 @@ RouteList
 MixerGroupTabs::selected_routes () const
 {
 	RouteList rl;
-	BOOST_FOREACH (RouteUI* r, _mixer->selection().routes) {
-		boost::shared_ptr<Route> rp = r->route();
+	BOOST_FOREACH (AxisView* r, _mixer->selection().axes) {
+		boost::shared_ptr<Route> rp = boost::dynamic_pointer_cast<Route> (r->stripable());
 		if (rp) {
 			rl.push_back (rp);
 		}
@@ -183,8 +200,3 @@ MixerGroupTabs::selected_routes () const
 	return rl;
 }
 
-void
-MixerGroupTabs::sync_order_keys ()
-{
-	_mixer->sync_order_keys_from_treeview ();
-}