From 9b7fb867f77bf0819bdfe1a4ceb55aade7db6f1b Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 21 Feb 2013 22:10:21 +0100 Subject: 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. --- DOCS/man/en/input.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS/man/en/input.rst') diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index 8a9b4f0e42..a0d2ad00c4 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -14,7 +14,7 @@ with shift. A list of special keys can be obtained with -| **mpv** --input=keylist +| **mpv** --input-keylist In general, keys can be combined with ``Shift``, ``Ctrl`` and ``Alt``: @@ -23,7 +23,7 @@ In general, keys can be combined with ``Shift``, ``Ctrl`` and ``Alt``: **mpv** can be started in input test mode, which displays key bindings and the commands they're bound to on the OSD, instead of running the commands: -| **mpv** --input=test --demuxer=rawvideo --rawvideo=w=1280:h=720 /dev/zero +| **mpv** --input-test --demuxer=rawvideo --rawvideo=w=1280:h=720 /dev/zero (Commands which normally close the player will not work in this mode, and you must kill **mpv** externally to make it exit.) @@ -51,7 +51,7 @@ List of input commands ignore Use this to "block" keys that should be unbound, and do nothing. Useful for disabling default bindings, without disabling all bindings with - ``--input=default-bindings=no``. + ``--no-input-default-bindings``. seek [relative|absolute|absolute-percent|- [default-precise|exact|keyframes]] Change the playback position. By default, seeks by a relative amount of -- cgit v1.2.3