diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 19:33:45 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 20:50:13 +0100 |
| commit | ed71606e65e697ea6bc9fc78caf2dd4089dc0aeb (patch) | |
| tree | d3b80546a8e40c821ee7575c236d813021b8b7c8 /input/joystick.h | |
| parent | dadf3a9a46d31a101aeaa1256b0d6f914eb32f1e (diff) | |
| download | mpv-ed71606e65e697ea6bc9fc78caf2dd4089dc0aeb.tar.bz2 mpv-ed71606e65e697ea6bc9fc78caf2dd4089dc0aeb.tar.xz | |
input: rework how input sources are added
Until now, there were two functions to add input sources (stuff like
stdin input, slave mode, lirc, joystick). Unify them to a single
function (mp_input_add_fd()), and make sure the associated callbacks
always have a context parameter.
Change the lirc and joystick code such that they take store their state
in a context struct (probably worthless), and use the new mp_msg
replacements (the point of this refactoring).
Additionally, get rid of the ugly USE_FD0_CMD_SELECT etc. ifdeffery in
the terminal handling code.
Diffstat (limited to 'input/joystick.h')
| -rw-r--r-- | input/joystick.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/input/joystick.h b/input/joystick.h index b9480eb686..7dc3883c83 100644 --- a/input/joystick.h +++ b/input/joystick.h @@ -19,8 +19,8 @@ #ifndef MPLAYER_JOYSTICK_H #define MPLAYER_JOYSTICK_H -int mp_input_joystick_init(char* dev); - -int mp_input_joystick_read(void *ctx, int fd); +struct input_ctx; +struct mp_log; +int mp_input_joystick_init(struct input_ctx *ictx, struct mp_log *log, char *dev); #endif /* MPLAYER_JOYSTICK_H */ |