RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-22 14:52:43 +00:00
Code Issues Releases Wiki Activity

input: convert autorepeat timing to nanoseconds

Browse Source
This commit is contained in:
Dudemanguy 2023-10-11 14:04:52 -05:00
parent 635674a4a0
commit 0fd8f0b3c1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
input/input.c
View File

@ -590,7 +590,7 @@ static void interpret_key(struct input_ctx *ictx, int code, double scale,
ictx->current_down_cmd = mp_cmd_clone(cmd); ictx->current_down_cmd = mp_cmd_clone(cmd);
} }
ictx->last_key_down = code; ictx->last_key_down = code;
ictx->last_key_down_time = mp_time_us(); ictx->last_key_down_time = mp_time_ns();
ictx->ar_state = 0; ictx->ar_state = 0;
mp_input_wakeup(ictx); // possibly start timer for autorepeat mp_input_wakeup(ictx); // possibly start timer for autorepeat
} else if (state == MP_KEY_STATE_UP) { } else if (state == MP_KEY_STATE_UP) {
@ -915,19 +915,19 @@ static mp_cmd_t *check_autorepeat(struct input_ctx *ictx)
ictx->ar_state = -1; // disable ictx->ar_state = -1; // disable
if (ictx->ar_state >= 0) { if (ictx->ar_state >= 0) {
int64_t t = mp_time_us(); int64_t t = mp_time_ns();
if (ictx->last_ar + 2000000 < t) if (ictx->last_ar + MP_TIME_S_TO_NS(2) < t)
ictx->last_ar = t; ictx->last_ar = t;
// First time : wait delay // First time : wait delay
if (ictx->ar_state == 0 if (ictx->ar_state == 0
&& (t - ictx->last_key_down_time) >= opts->ar_delay * 1000) && (t - ictx->last_key_down_time) >= MP_TIME_MS_TO_NS(opts->ar_delay))
{ {
ictx->ar_state = 1; ictx->ar_state = 1;
ictx->last_ar = ictx->last_key_down_time + opts->ar_delay * 1000; ictx->last_ar = ictx->last_key_down_time + MP_TIME_MS_TO_NS(opts->ar_delay);
// Then send rate / sec event // Then send rate / sec event
} else if (ictx->ar_state == 1 } else if (ictx->ar_state == 1
&& (t - ictx->last_ar) >= 1000000 / opts->ar_rate) { && (t - ictx->last_ar) >= 1e9 / opts->ar_rate) {
ictx->last_ar += 1000000 / opts->ar_rate; ictx->last_ar += 1e9 / opts->ar_rate;
} else { } else {
return NULL; return NULL;
} }