summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-24 16:02:48 +0100
committerwm4 <wm4@nowhere>2015-03-24 16:04:44 +0100
commit9b5a7241e88f8147a391f1bb79ce01593a02d443 (patch)
treec6b986d7d29b9828c9d7e1c758416f3988763f41 /DOCS
parent1e659a9f0f3a3836912c66ab75b5af38e632ef12 (diff)
downloadmpv-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 'DOCS')
-rw-r--r--DOCS/man/mpv.rst2
-rw-r--r--DOCS/man/options.rst6
-rw-r--r--DOCS/mplayer-changes.rst1
3 files changed, 1 insertions, 8 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index df25af40c7..74750673dd 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -32,7 +32,7 @@ INTERACTIVE CONTROL
===================
mpv has a fully configurable, command-driven control layer which allows you
-to control mpv using keyboard, mouse, joystick or remote control (there is no
+to control mpv using keyboard, mouse, or remote control (there is no
LIRC support - configure remotes as input devices instead).
See the ``--input-`` options for ways to customize it.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 458ec87fca..763e0c832a 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2358,12 +2358,6 @@ Input
driver. Necessary to use the OSC, or to select the buttons in DVD menus.
Support depends on the VO in use.
-``--input-joystick``, ``--no-input-joystick``
- Enable/disable joystick support. Disabled by default.
-
-``--input-js-dev``
- Specifies the joystick device to use (default: ``/dev/input/js0``).
-
``--input-media-keys=<yes|no>``
(OS X only)
Enable/disable media keys support. Enabled by default (except for libmpv).
diff --git a/DOCS/mplayer-changes.rst b/DOCS/mplayer-changes.rst
index 97892a4232..bd803e41f3 100644
--- a/DOCS/mplayer-changes.rst
+++ b/DOCS/mplayer-changes.rst
@@ -241,7 +241,6 @@ Command Line Switches
``-noar`` ``--no-input-appleremote``
``-noautosub`` ``--no-sub-auto``
``-noconsolecontrols`` ``--no-input-terminal``
- ``-nojoystick`` ``--no-input-joystick``
``-nosound`` ``--no-audio``
``-osdlevel`` ``--osd-level``
``-panscanrange`` ``--video-zoom``, ``--video-pan-x/y``