summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-04-18 17:16:33 +0200
committerwm4 <wm4@nowhere>2014-04-18 17:16:33 +0200
commit46e0ede228e38b87bf6d15806e1b020923bf8a2d (patch)
treebc65b44dabc6e46d24b4ed137a7ed29995dfd858 /input
parentcca13efb192b04a35cfde8ad70cff5312b3e93fa (diff)
downloadmpv-46e0ede228e38b87bf6d15806e1b020923bf8a2d.tar.bz2
mpv-46e0ede228e38b87bf6d15806e1b020923bf8a2d.tar.xz
input: rename a variable
Squashing this with the following commit would be confusing.
Diffstat (limited to 'input')
-rw-r--r--input/input.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/input/input.c b/input/input.c
index 86d95e690c..e328cda169 100644
--- a/input/input.c
+++ b/input/input.c
@@ -142,7 +142,7 @@ struct input_ctx {
// these are the keys currently down
int key_down[MP_MAX_KEY_DOWN];
unsigned int num_key_down;
- int64_t last_key_down;
+ int64_t last_key_down_time;
bool current_down_cmd_need_release;
struct mp_cmd *current_down_cmd;
@@ -529,7 +529,7 @@ static void release_down_cmd(struct input_ctx *ictx, bool drop_current)
}
ictx->current_down_cmd = NULL;
ictx->current_down_cmd_need_release = false;
- ictx->last_key_down = 0;
+ ictx->last_key_down_time = 0;
ictx->ar_state = -1;
}
@@ -615,7 +615,7 @@ static void interpret_key(struct input_ctx *ictx, int code, double scale)
ictx->key_down[ictx->num_key_down] = code & ~MP_KEY_STATE_DOWN;
ictx->num_key_down++;
update_mouse_section(ictx);
- ictx->last_key_down = mp_time_us();
+ ictx->last_key_down_time = mp_time_us();
ictx->ar_state = 0;
cmd = get_cmd_from_keys(ictx, NULL, code & ~MP_KEY_STATE_DOWN);
key_buf_add(ictx->key_history, code & ~MP_KEY_STATE_DOWN);
@@ -1095,14 +1095,14 @@ static mp_cmd_t *check_autorepeat(struct input_ctx *ictx)
ictx->last_ar = t;
// First time : wait delay
if (ictx->ar_state == 0
- && (t - ictx->last_key_down) >= ictx->ar_delay * 1000)
+ && (t - ictx->last_key_down_time) >= ictx->ar_delay * 1000)
{
if (!ictx->current_down_cmd) {
ictx->ar_state = -1;
return NULL;
}
ictx->ar_state = 1;
- ictx->last_ar = ictx->last_key_down + ictx->ar_delay * 1000;
+ ictx->last_ar = ictx->last_key_down_time + ictx->ar_delay * 1000;
return mp_cmd_clone(ictx->current_down_cmd);
// Then send rate / sec event
} else if (ictx->ar_state == 1