summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en/options.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-02-21 22:10:21 +0100
committerwm4 <wm4@nowhere>2013-02-23 00:07:11 +0100
commit9b7fb867f77bf0819bdfe1a4ceb55aade7db6f1b (patch)
tree99b1f9f42a5902ee56629306317f5fae431ab05c /DOCS/man/en/options.rst
parente540e5d4da607420cc10f4c2b412aa0ff3d1fb5c (diff)
downloadmpv-9b7fb867f77bf0819bdfe1a4ceb55aade7db6f1b.tar.bz2
mpv-9b7fb867f77bf0819bdfe1a4ceb55aade7db6f1b.tar.xz
options: drop --opt:subopt option names
For all suboptions, "flat" options were available by separating the parent option and the sub option with ":", e.g. "--rawvideo:w=123". Drop this syntax and use "-" as separator. This means even suboptions are available as normal options now, e.g. "--rawvideo-w=123". The old syntax doesn't work anymore. Note that this is completely separate from actual suboptions. For example, "-rawvideo w=123:h=123" still works. (Not that this syntax is worth supporting, but it's needed anyway, for for other things like vf and vo suboptions.) As a consequence of this change, we also have to add new "no-" prefixed options for flag suboptions, so that "--no-input-default-bindings" works. ("--input-no-default-bindings" also works as a consequence of allowing "-input no-default-bindings" - they are handled by the same underlying option.) For --input, always use the full syntax in the manpage. There exist suboptions other than --input (like --tv, --rawvideo, etc.), but since they might be handled differently in the future, don't touch these yet. M_OPT_PREFIXED becomes the default, so remove it. As a minor unrelated cleanup, get rid of M_OPT_MERGE too and use the OPT_SUBSTRUCT() macro in some places. Unrelated: remove the duplicated --tv:buffersize option, fix a typo in changes.rst.
Diffstat (limited to 'DOCS/man/en/options.rst')
-rw-r--r--DOCS/man/en/options.rst70
1 files changed, 31 insertions, 39 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index fcab7ae8e0..fcfc17923e 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -896,55 +896,47 @@
their start timestamps differ, and then video timing is gradually adjusted
if necessary to reach correct synchronization later.
---input=<commands>
- This option can be used to configure certain parts of the input system.
- Paths are relative to ``~/.mpv/``.
+--input-conf=<filename>
+ Specify input configuration file other than the default
+ ``~/.mpv/input.conf``.
- *NOTE*: Autorepeat is currently only supported by joysticks.
+--input-ar-dev=<device>
+ Device to be used for Apple IR Remote (default is autodetected, Linux
+ only).
- Available commands are:
+--input-ar-delay
+ Delay in milliseconds before we start to autorepeat a key (0 to
+ disable).
- conf=<filename>
- Specify input configuration file other than the default
- ``~/.mpv/input.conf``.
+--input-ar-rate
+ Number of key presses to generate per second on autorepeat.
- ar-dev=<device>
- Device to be used for Apple IR Remote (default is autodetected, Linux
- only).
+--no-input-default-bindings
+ Use the key bindings that mpv ships with by default.
- ar-delay
- Delay in milliseconds before we start to autorepeat a key (0 to
- disable).
+--input-keylist
+ Prints all keys that can be bound to commands.
- ar-rate
- Number of key presses to generate per second on autorepeat.
+--input-cmdlist
+ Prints all commands that can be bound to keys.
- (no-)default-bindings
- Use the key bindings that mpv ships with by default.
+--input-js-dev
+ Specifies the joystick device to use (default: ``/dev/input/js0``).
- keylist
- Prints all keys that can be bound to commands.
+--input-file=<filename>
+ Read commands from the given file. Mostly useful with a FIFO.
+ See also ``--slave``.
- cmdlist
- Prints all commands that can be bound to keys.
+ *NOTE*: When the given file is a FIFO mpv opens both ends so you
+ can do several `echo "seek 10" > mp_pipe` and the pipe will stay
+ valid.
- js-dev
- Specifies the joystick device to use (default: ``/dev/input/js0``).
-
- file=<filename>
- Read commands from the given file. Mostly useful with a FIFO.
- See also ``--slave``.
-
- *NOTE*: When the given file is a FIFO mpv opens both ends so you
- can do several `echo "seek 10" > mp_pipe` and the pipe will stay
- valid.
-
- test
- Input test mode. Instead of executing commands on key presses, mpv
- will show the keys and the bound commands on the OSD. Has to be used
- with a dummy video, and the normal ways to quit the player will not
- work (key bindings that normally quit will be shown on OSD only, just
- like any other binding).
+--input-test
+ Input test mode. Instead of executing commands on key presses, mpv
+ will show the keys and the bound commands on the OSD. Has to be used
+ with a dummy video, and the normal ways to quit the player will not
+ work (key bindings that normally quit will be shown on OSD only, just
+ like any other binding).
--ipv4-only-proxy
Skip any HTTP proxy for IPv6 addresses. It will still be used for IPv4