use new action map API instead of ActionManager::get_action

[ardour.git] / gtk2_ardour / mixer_group_tabs.cc

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index c26a55390504dccd1296e67b1cc5820b44399ba2..8b5907c7d8ecef2302a8848130ed02e144ebf58d 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -23,7 +23,7 @@
 
 #include "ardour/route_group.h"
 
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
 
 #include "mixer_group_tabs.h"
 #include "mixer_strip.h"
@@ -113,9 +113,9 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab)
        double r, g, b, a;
 
        if (tab.group && tab.group->is_active()) {
-               ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
+               Gtkmm2ext::color_to_rgba (tab.color, r, g, b, a);
        } else {
-               ArdourCanvas::color_to_rgba (UIConfiguration::instance().color ("inactive group tab"), r, g, b, a);
+               Gtkmm2ext::color_to_rgba (UIConfiguration::instance().color ("inactive group tab"), r, g, b, a);
        }
 
        a = 1.0;
@@ -140,8 +140,8 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab)
 
                cairo_move_to (cr, tab.from + (tab.to - tab.from - text_width) * .5, (get_height () - text_height) * .5);
 
-               ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
-               ArdourCanvas::color_to_rgba (c, r, g, b, a);
+               Gtkmm2ext::Color c = Gtkmm2ext::contrasting_text_color (Gtkmm2ext::rgba_to_color (r, g, b, a));
+               Gtkmm2ext::color_to_rgba (c, r, g, b, a);
                cairo_set_source_rgb (cr, r, g, b);
 
                pango_cairo_show_layout (cr, layout->gobj ());