when calculating average slave/master delta, use absolute value.

[ardour.git] / gtk2_ardour / shuttle_control.cc

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 010ac2d11941ea8027197f83179e922a44f3fa2c..ce3ce3c5936f11cf9a2cdf07290535476b752535 100644 (file)
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -27,26 +27,24 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
+#include "gtkmm2ext/colors.h"
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/gui_thread.h"
-#include "gtkmm2ext/cairocell.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/rgb_macros.h"
 
-#include "canvas/utils.h"
-#include "canvas/colors.h"
+#include "widgets/tooltips.h"
 
 #include "actions.h"
 #include "rgb_macros.h"
 #include "shuttle_control.h"
-#include "tooltips.h"
 
 #include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 using std::min;
 using std::max;
 
@@ -570,8 +568,9 @@ ShuttleControl::set_colors ()
 }
 
 void
-ShuttleControl::render (cairo_t* cr, cairo_rectangle_t*)
+ShuttleControl::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_t*)
 {
+       cairo_t* cr = ctx->cobj();
        // center slider line
        float yc = get_height() / 2;
        float lw = 3;
@@ -610,7 +609,7 @@ ShuttleControl::render (cairo_t* cr, cairo_rectangle_t*)
        rounded_rectangle (cr, x + 1, 1, marker_size - 2, get_height() - 2, 3.5);
        if (_flat_buttons) {
                uint32_t col = UIConfiguration::instance().color ("shuttle");
-               ArdourCanvas::set_source_rgba (cr, col);
+               Gtkmm2ext::set_source_rgba (cr, col);
        } else {
                cairo_set_source (cr, pattern);
        }