auditioner always runs at normal speed, independent of transport speed
[ardour.git] / gtk2_ardour / port_matrix_row_labels.cc
index c6b02eb488cc3ca85e298dc7baf070034172d61b..ff7ac6a48ad29b607a28a816ab6d307836a65939 100644 (file)
@@ -22,7 +22,7 @@
 #include <cairo.h>
 #include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
 #include "utils.h"
 #include "port_matrix_row_labels.h"
 #include "port_matrix.h"
@@ -236,7 +236,7 @@ PortMatrixRowLabels::render_bundle_name (
        double const off = (grid_spacing() - ext.height) / 2;
 
        Gdk::Color textcolor;
-       ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
+       ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
        set_source_rgb (cr, textcolor);
        cairo_move_to (cr, xoff + x + name_pad(), yoff + name_pad() + off);
        cairo_show_text (cr, b->name().c_str());
@@ -264,7 +264,7 @@ PortMatrixRowLabels::render_channel_name (
                double const off = (grid_spacing() - ext.height) / 2;
 
                Gdk::Color textcolor;
-               ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
+               ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
                set_source_rgb (cr, textcolor);
                cairo_move_to (cr, port_name_x() + xoff + name_pad(), yoff + name_pad() + off);
                cairo_show_text (cr, bc.bundle->channel_name(bc.channel).c_str());