remove superfluous PBD/ARDOUR:: init calls

[ardour.git] / libs / surfaces / tranzport / wheel.cc

diff --git a/libs/surfaces/tranzport/wheel.cc b/libs/surfaces/tranzport/wheel.cc
index 87b935da4b0e11a3375b8230c7f9a8746ff8daba..3f15e060a2d64ee8ba1443bd07b5192d7c6cb040 100644 (file)
--- a/libs/surfaces/tranzport/wheel.cc
+++ b/libs/surfaces/tranzport/wheel.cc
@@ -62,7 +62,7 @@ TranzportControlProtocol::datawheel ()
                        prev_track ();
                }
 
-               timerclear (&last_wheel_motion);
+               last_wheel_motion = 0;
                
        } else if ((buttonmask & ButtonPrev) || (buttonmask & ButtonNext)) {
 
@@ -72,7 +72,7 @@ TranzportControlProtocol::datawheel ()
                        prev_marker ();
                }
                
-               timerclear (&last_wheel_motion);
+               last_wheel_motion = 0;
                
        } else if (buttonmask & ButtonShift) {
                
@@ -104,7 +104,7 @@ TranzportControlProtocol::datawheel ()
                        }
                }
                
-               timerclear (&last_wheel_motion);
+               last_wheel_motion = 0;
                
        } else {
                
@@ -149,11 +149,10 @@ void
 TranzportControlProtocol::scrub ()
 {
        float speed;
-       struct timeval now;
-       struct timeval delta;
+       uint64_t now;
        int dir;
        
-       gettimeofday (&now, 0);
+       now = g_get_monotonic_time();
        
        if (_datawheel < WheelDirectionThreshold) {
                dir = 1;
@@ -165,13 +164,10 @@ TranzportControlProtocol::scrub ()
                /* changed direction, start over */
                speed = 0.1f;
        } else {
-               if (timerisset (&last_wheel_motion)) {
-
-                       timersub (&now, &last_wheel_motion, &delta);
-                       
+               if (last_wheel_motion != 0) {
                        /* 10 clicks per second => speed == 1.0 */
                        
-                       speed = 100000.0f / (delta.tv_sec * 1000000 + delta.tv_usec);
+                       speed = 100000.0f / (float) (now - last_wheel_motion)
                        
                } else {
                        
@@ -194,13 +190,13 @@ TranzportControlProtocol::shuttle ()
                if (session->transport_speed() < 0) {
                        session->request_transport_speed (1.0);
                } else {
-                       session->request_transport_speed (session->transport_speed() + 0.1);
+                       session->request_transport_speed_nonzero (session->transport_speed() + 0.1);
                }
        } else {
                if (session->transport_speed() > 0) {
                        session->request_transport_speed (-1.0);
                } else {
-                       session->request_transport_speed (session->transport_speed() - 0.1);
+                       session->request_transport_speed_nonzero (session->transport_speed() - 0.1);
                }
        }
 }