summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-10-25 21:54:35 +0200
committerwm4 <wm4@nowhere>2019-10-25 21:54:35 +0200
commit4a823499002f3e6c9c7ceb781f0e4933cbfb9b24 (patch)
tree3520704914d62298b9c0bf6e510225b7d7618f55
parent52536aaa7b2cd1b8fe6b0d197f13aeb907aa7bea (diff)
downloadmpv-4a823499002f3e6c9c7ceb781f0e4933cbfb9b24.tar.bz2
mpv-4a823499002f3e6c9c7ceb781f0e4933cbfb9b24.tar.xz
input: disable gamepad code by default
Enabling this by default probably causes a number of issues, such as breaking vo_sdl, or reacting to various input devices while the window is not focused. It's also pretty obscure, or at least new. Disable it by default.
-rw-r--r--DOCS/man/options.rst2
-rw-r--r--etc/builtin.conf1
-rw-r--r--input/input.c3
3 files changed, 1 insertions, 5 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 5d35e226dc..197423e6b2 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -3408,7 +3408,7 @@ Input
Enable/disable Apple Remote support. Enabled by default (except for libmpv).
``--input-gamepad=<yes|no>``
- Enable/disable SDL2 Gamepad support. Enabled by default (except for libmpv).
+ Enable/disable SDL2 Gamepad support. Disabled by default.
``--input-cursor``, ``--no-input-cursor``
Permit mpv to receive pointer events reported by the video output
diff --git a/etc/builtin.conf b/etc/builtin.conf
index 1e3702c68e..28788c9598 100644
--- a/etc/builtin.conf
+++ b/etc/builtin.conf
@@ -26,7 +26,6 @@ input-terminal=no
osc=no
input-default-bindings=no
input-vo-keyboard=no
-input-gamepad=no
# OSX/Cocoa global input hooks
input-appleremote=no
input-media-keys=no
diff --git a/input/input.c b/input/input.c
index 32ee75b4cf..4dced9c78d 100644
--- a/input/input.c
+++ b/input/input.c
@@ -219,9 +219,6 @@ const struct m_sub_options input_config = {
#if HAVE_COCOA
.use_appleremote = 1,
#endif
-#if HAVE_SDL2_GAMEPAD
- .use_gamepad = 1,
-#endif
.default_bindings = 1,
.vo_key_input = 1,
.allow_win_drag = 1,