summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-19 21:31:27 +0100
committerwm4 <wm4@nowhere>2013-12-19 21:31:27 +0100
commit25d4ae74f1dbddf99b147df0887d6810d34e36dd (patch)
tree02e0d851e5aa1a70c1e528caec1aeeb6a6620076 /input
parent8c7ea10873ced7c4e0344d942be4792e9d7a2801 (diff)
downloadmpv-25d4ae74f1dbddf99b147df0887d6810d34e36dd.tar.bz2
mpv-25d4ae74f1dbddf99b147df0887d6810d34e36dd.tar.xz
Rename getch2....c/h to terminal....c/h
"getch2" really tells nothing about what the heck this code does. It'd be even worse when moving the rest of terminal handling code there.
Diffstat (limited to 'input')
-rw-r--r--input/input.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/input/input.c b/input/input.c
index 9868ac1423..6ae14f892d 100644
--- a/input/input.c
+++ b/input/input.c
@@ -36,7 +36,6 @@
#include <libavutil/common.h>
#include "osdep/io.h"
-#include "osdep/getch2.h"
#include "input.h"
#include "keycodes.h"
@@ -1859,12 +1858,6 @@ static void read_events(struct input_ctx *ictx, int time)
}
}
-static void read_all_events(struct input_ctx *ictx, int time)
-{
- getch2_poll();
- read_events(ictx, time);
-}
-
int mp_input_queue_cmd(struct input_ctx *ictx, mp_cmd_t *cmd)
{
input_lock(ictx);
@@ -1919,7 +1912,7 @@ mp_cmd_t *mp_input_get_cmd(struct input_ctx *ictx, int time, int peek_only)
if (ictx->cmd_queue.first)
time = 0;
- read_all_events(ictx, time);
+ read_events(ictx, time);
struct cmd_queue *queue = &ictx->cmd_queue;
if (!queue->first) {
struct mp_cmd *repeated = check_autorepeat(ictx);
@@ -2529,7 +2522,7 @@ int mp_input_check_interrupt(struct input_ctx *ictx, int time)
input_lock(ictx);
bool res = test_abort(ictx);
if (!res) {
- read_all_events(ictx, time);
+ read_events(ictx, time);
res = test_abort(ictx);
}
input_unlock(ictx);