summaryrefslogtreecommitdiffstats
path: root/input/joystick.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-29 12:55:23 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-29 12:55:23 +0300
commit986e519fc9373e2b3dab6f86debcbd7e13466c34 (patch)
tree928eb75d2e6e5685fa468efe4e074a6825a197b9 /input/joystick.h
parentb6b82964aa3f9ba93f6f284ed97c278743f50fce (diff)
downloadmpv-986e519fc9373e2b3dab6f86debcbd7e13466c34.tar.bz2
mpv-986e519fc9373e2b3dab6f86debcbd7e13466c34.tar.xz
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.
Diffstat (limited to 'input/joystick.h')
-rw-r--r--input/joystick.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/input/joystick.h b/input/joystick.h
index 3a70f7cbd3..b318e9ec14 100644
--- a/input/joystick.h
+++ b/input/joystick.h
@@ -37,6 +37,6 @@
int mp_input_joystick_init(char* dev);
-int mp_input_joystick_read(int fd);
+int mp_input_joystick_read(void *ctx, int fd);
#endif /* MPLAYER_JOYSTICK_H */