projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5182f3
)
OSC scrub, fix numbers to work with usec rather than msec.
author
Len Ovens
<len@ovenwerks.net>
Mon, 1 May 2017 20:53:03 +0000
(13:53 -0700)
committer
Len Ovens
<len@ovenwerks.net>
Mon, 1 May 2017 20:53:03 +0000
(13:53 -0700)
libs/surfaces/osc/osc.cc
patch
|
blob
|
history
diff --git
a/libs/surfaces/osc/osc.cc
b/libs/surfaces/osc/osc.cc
index c2956fa551b4f3f96530ab7deecb0ff0501ec187..e12738d726d89226fbd1d4f327887c06ec09b57c 100644
(file)
--- 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;
int64_t now = ARDOUR::get_microseconds ();
int64_t diff = now - scrub_time;
- if (diff > 35) {
+ if (diff > 35
000
) {
// speed 1 (or 0 if jog wheel supports touch)
speed = delta;
// speed 1 (or 0 if jog wheel supports touch)
speed = delta;
- } else if ((diff > 20) && (fabs(scrub_speed) == 1)) {
+ } else if ((diff > 20
000
) && (fabs(scrub_speed) == 1)) {
// add some hysteresis to stop excess speed jumps
speed = delta;
} else {
// 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;
// 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 > 1
200
00) {
scrub_speed = 0;
session->request_transport_speed (0);
// locate to the place PH was at last tick
scrub_speed = 0;
session->request_transport_speed (0);
// locate to the place PH was at last tick