Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / shuttle_control.cc

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 027a432593ec12286f91ac9d03e23a30468a1a0b..c18bacc20f3f474960dc99b72fe41ba2cc00dfa1 100644 (file)
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -27,14 +27,12 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
+#include "gtkmm2ext/colors.h"
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/gui_thread.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"
@@ -156,7 +154,7 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc)
 void
 ShuttleControl::map_transport_state ()
 {
-       float speed = _session->transport_speed ();
+       float speed = _session->actual_speed ();
 
        if ( (fabsf( speed - last_speed_displayed) < 0.005f) // dead-zone
             && !( speed == 1.f && last_speed_displayed != 1.f)
@@ -301,7 +299,7 @@ ShuttleControl::on_button_press_event (GdkEventButton* ev)
                } else {
                        add_modal_grab ();
                        shuttle_grabbed = true;
-                       shuttle_speed_on_grab = _session->transport_speed ();
+                       shuttle_speed_on_grab = _session->actual_speed ();
                        requested_speed = shuttle_speed_on_grab;
                        mouse_shuttle (ev->x, true);
                        gdk_pointer_grab(ev->window,false,
@@ -592,7 +590,7 @@ ShuttleControl::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangl
        char buf[32];
 
        if (_session) {
-               speed = _session->transport_speed ();
+               speed = _session->actual_speed ();
                acutal_speed = speed;
                if (shuttle_grabbed) {
                        speed = requested_speed;
@@ -611,7 +609,7 @@ ShuttleControl::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangl
        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);
        }
@@ -701,7 +699,7 @@ ShuttleControl::parameter_changed (std::string p)
                         */
                        if (_session) {
                                if (_session->transport_rolling()) {
-                                       if (_session->transport_speed() == 1.0) {
+                                       if (_session->actual_speed() == 1.0) {
                                                queue_draw ();
                                        } else {
                                                /* reset current speed and