X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Feditor_group_tabs.cc;h=04f88542bafd180d893d229f4b11d0380ce86120;hb=dde13d288e22ba5dd8e23802c47fac288b089c57;hp=af5e63bd55a5700348ac7a39ab9450ef6fcbf1bd;hpb=a0e399f7dd15a69c25660f4a4bb58b12f27297a6;p=ardour.git

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index af5e63bd55..04f88542ba 100644
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -21,18 +21,18 @@
 
 #include "ardour/route_group.h"
 
-#include "canvas/utils.h"
+#include "canvas/colors.h"
 
-#include "ardour_ui.h"
 #include "editor.h"
 #include "editor_group_tabs.h"
 #include "editor_route_groups.h"
 #include "editor_routes.h"
 #include "rgb_macros.h"
 #include "route_time_axis.h"
+#include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -91,11 +91,11 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
 	double const arc_radius = get_width();
 	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;
@@ -114,7 +114,7 @@ EditorGroupTabs::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 = contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
+		ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
 		ArdourCanvas::color_to_rgba (c, r, g, b, a);
 
 		cairo_set_source_rgb (cr, r, g, b);
@@ -177,19 +177,6 @@ EditorGroupTabs::add_menu_items (Gtk::Menu* m, RouteGroup* g)
 	}
 }
 
-PBD::PropertyList
-EditorGroupTabs::default_properties () const
-{
-	PBD::PropertyList plist;
-
-	plist.add (Properties::active, true);
-	plist.add (Properties::mute, true);
-	plist.add (Properties::solo, true);
-	plist.add (Properties::recenable, true);
-
-	return plist;
-}
-
 RouteList
 EditorGroupTabs::selected_routes () const
 {
@@ -205,8 +192,3 @@ EditorGroupTabs::selected_routes () const
 	return rl;
 }
 
-void
-EditorGroupTabs::sync_order_keys ()
-{
-	_editor->_routes->sync_order_keys_from_treeview ();
-}