From 986e519fc9373e2b3dab6f86debcbd7e13466c34 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Tue, 29 Apr 2008 12:55:23 +0300 Subject: input: Remove separate mp_input_add_event_fd Use the same mp_input_add_key_fd for all uses and add a context argument to its callback that was before only in the event fd callbacks. Instead of checking in input.c whether keys were inserted to the keypress FIFO during the callback do the check in the callback before returning and set return value accordingly. --- input/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'input/joystick.c') diff --git a/input/joystick.c b/input/joystick.c index ec3720548d..02e00d207f 100644 --- a/input/joystick.c +++ b/input/joystick.c @@ -73,7 +73,7 @@ int mp_input_joystick_init(char* dev) { return fd; } -int mp_input_joystick_read(int fd) { +int mp_input_joystick_read(void *ctx, int fd) { struct js_event ev; int l=0; -- cgit v1.2.3