diff options
| author | wm4 <wm4@nowhere> | 2015-03-24 16:02:48 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-24 16:04:44 +0100 |
| commit | 9b5a7241e88f8147a391f1bb79ce01593a02d443 (patch) | |
| tree | c6b986d7d29b9828c9d7e1c758416f3988763f41 /input/input.c | |
| parent | 1e659a9f0f3a3836912c66ab75b5af38e632ef12 (diff) | |
| download | mpv-9b5a7241e88f8147a391f1bb79ce01593a02d443.tar.bz2 mpv-9b5a7241e88f8147a391f1bb79ce01593a02d443.tar.xz | |
input: remove Linux joystick support
Why did this exist in the first place? Other than being completely
useless, this even caused some regressions in the past. For example,
there was the case of a laptop exposing its accelerometer as joystick
device, which led to extremely fun things due to the default mappings of
axis movement being mapped to seeking.
I suppose those who really want to use their joystick to control a media
player (???) can configure it as mouse device or so.
Diffstat (limited to 'input/input.c')
| -rw-r--r-- | input/input.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/input/input.c b/input/input.c index b6719fc297..6bbba907d1 100644 --- a/input/input.c +++ b/input/input.c @@ -163,8 +163,6 @@ struct input_opts { // Autorepeat config (be aware of mp_input_set_repeat_info()) int ar_delay; int ar_rate; - char *js_dev; - int use_joystick; int use_alt_gr; int use_appleremote; int use_media_keys; @@ -182,11 +180,9 @@ const struct m_sub_options input_config = { OPT_INT("ar-rate", ar_rate, CONF_GLOBAL), OPT_PRINT("keylist", mp_print_key_list), OPT_PRINT("cmdlist", mp_print_cmd_list), - OPT_STRING("js-dev", js_dev, CONF_GLOBAL), OPT_FLAG("default-bindings", default_bindings, CONF_GLOBAL), OPT_FLAG("test", test, CONF_GLOBAL), OPT_INTRANGE("doubleclick-time", doubleclick_time, 0, 0, 1000), - OPT_FLAG("joystick", use_joystick, CONF_GLOBAL), OPT_FLAG("right-alt-gr", use_alt_gr, CONF_GLOBAL), OPT_INTRANGE("key-fifo-size", key_fifo_size, CONF_GLOBAL, 2, 65000), OPT_FLAG("cursor", enable_mouse_movements, CONF_GLOBAL), @@ -1244,11 +1240,6 @@ void mp_input_load(struct input_ctx *ictx) MP_VERBOSE(ictx, "Falling back on default (hardcoded) input config\n"); } -#if HAVE_JOYSTICK - if (input_conf->use_joystick) - mp_input_joystick_add(ictx, input_conf->js_dev); -#endif - if (input_conf->use_alt_gr) { ictx->using_alt_gr = true; } |