X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=25dbae44843a23b6450616c94f3ba9fe569d5e98;hb=868ed09499423c1d004dcd9885b33a45e5e08ddc;hp=03e9409df22b4dfc07b83e17e7f1192b88a92e85;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 03e9409df2..25dbae4484 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -23,14 +23,14 @@
 
 #include "ardour/route_group.h"
 
-#include "canvas/utils.h"
+#include "canvas/colors.h"
 
-#include "ardour_ui.h"
 #include "mixer_group_tabs.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "rgb_macros.h"
 #include "route_group_dialog.h"
+#include "ui_config.h"
 #include "utils.h"
 
 #include "i18n.h"
@@ -61,7 +61,12 @@ 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;
@@ -83,7 +88,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 +106,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 (ARDOUR_UI::config()->get_canvasvar_InactiveGroupTab(), r, g, b, a);
+		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 +127,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 +154,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 */
@@ -170,26 +182,12 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
 	return routes;
 }
 
-PropertyList
-MixerGroupTabs::default_properties () const
-{
-	PropertyList plist;
-
-	plist.add (Properties::active, true);
-	plist.add (Properties::mute, true);
-	plist.add (Properties::solo, true);
-	plist.add (Properties::gain, true);
-	plist.add (Properties::recenable, true);
-
-	return plist;
-}
-
 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);
 		}
@@ -197,8 +195,3 @@ MixerGroupTabs::selected_routes () const
 	return rl;
 }
 
-void
-MixerGroupTabs::sync_order_keys ()
-{
-	_mixer->sync_order_keys_from_treeview ();
-}