add john and todd to contributor list

[ardour.git] / gtk2_ardour / shuttle_control.cc

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 1d150f73d67511ff8a60ab838e0820a3376e601c..5eacf3c93b9b8f619d3c47821075aecdf257e6b7 100644 (file)
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -113,7 +113,7 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc)
 
        //background
        pattern = cairo_pattern_create_linear (0, 0, 0, alloc.get_height());
-       uint32_t col = ARDOUR_UI::config()->get_canvasvar_Shuttle();
+       uint32_t col = ARDOUR_UI::config()->color ("shuttle");
        int r,b,g,a;
        UINT_TO_RGBA(col, &r, &g, &b, &a);
        cairo_pattern_add_color_stop_rgb (pattern, 0.0, r/400.0, g/400.0, b/400.0);
@@ -512,7 +512,7 @@ ShuttleControl::use_shuttle_fract (bool force, bool zero_ok)
 }
 
 void
-ShuttleControl::render (cairo_t* cr)
+ShuttleControl::render (cairo_t* cr, cairo_rectangle_t*)
 {
        cairo_text_extents_t extents;
 
@@ -615,7 +615,7 @@ ShuttleControl::render (cairo_t* cr)
        cairo_set_source (cr, shine_pattern);
        cairo_fill (cr);
 */
-       if (ARDOUR::Config->get_widget_prelight()) {
+       if (ARDOUR_UI::config()->get_widget_prelight()) {
                if (_hovering) {
                        rounded_rectangle (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius);
                        cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
@@ -712,7 +712,7 @@ ShuttleControl::on_enter_notify_event (GdkEventCrossing* ev)
 {
        _hovering = true;
 
-       if (ARDOUR::Config->get_widget_prelight()) {
+       if (ARDOUR_UI::config()->get_widget_prelight()) {
                queue_draw ();
        }
 
@@ -724,7 +724,7 @@ ShuttleControl::on_leave_notify_event (GdkEventCrossing* ev)
 {
        _hovering = false;
 
-       if (ARDOUR::Config->get_widget_prelight()) {
+       if (ARDOUR_UI::config()->get_widget_prelight()) {
                queue_draw ();
        }