allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

more gettimeofday() -> g_get_monotonic_time()

Browse Source
This commit is contained in:
Robin Gareus
2014-05-16 19:58:46 +02:00
parent 5fba8a2015
commit f3349a797c
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
View File

@@ -154,7 +154,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
framepos_t last_where;
ARDOUR::gain_t last_track_gain;
uint32_t last_meter_fill;
struct timeval last_wheel_motion;
uint64_t last_wheel_motion;
int last_wheel_dir;
Glib::Mutex io_lock;

18
libs/surfaces/tranzport/wheel.cc
View File

@@ -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 {