diff options
author | Len Ovens <len@ovenwerks.net> | 2017-05-01 13:53:03 -0700 |
---|---|---|
committer | Len Ovens <len@ovenwerks.net> | 2017-05-01 13:53:03 -0700 |
commit | 2abefde534690f78d508bf7a297f3dd89f0204b3 (patch) | |
tree | fd74b78ee787871a2c45c970123491a439d4754d | |
parent | e5182f3eb46e8ccad23aa61b8ed3ae528f3ec540 (diff) |
OSC scrub, fix numbers to work with usec rather than msec.
-rw-r--r-- | libs/surfaces/osc/osc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index c2956fa551..e12738d726 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -1762,10 +1762,10 @@ OSC::scrub (float delta, lo_message msg) int64_t now = ARDOUR::get_microseconds (); int64_t diff = now - scrub_time; - if (diff > 35) { + if (diff > 35000) { // speed 1 (or 0 if jog wheel supports touch) speed = delta; - } else if ((diff > 20) && (fabs(scrub_speed) == 1)) { + } else if ((diff > 20000) && (fabs(scrub_speed) == 1)) { // add some hysteresis to stop excess speed jumps speed = delta; } else { @@ -3616,7 +3616,7 @@ OSC::periodic (void) // for those jog wheels that don't have 0 on release (touch), time out. int64_t now = ARDOUR::get_microseconds (); int64_t diff = now - scrub_time; - if (diff > 100) { + if (diff > 120000) { scrub_speed = 0; session->request_transport_speed (0); // locate to the place PH was at last tick |