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. --- etc/input.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'etc') diff --git a/etc/input.conf b/etc/input.conf index 3b34545705..59b7a97d40 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -3,10 +3,10 @@ # You are able to redefine default keyboard/joystick/mouse/LIRC bindings, or # add new ones here. # See DOCS/man/en/input.rst for possible commands that can be bound. -# Also see mpv --input=cmdlist for other possible options. +# Also see mpv --input-cmdlist for other possible options. # The file should be placed in the $HOME/.mpv directory. # -# mpv --input=test --pause dummy.mkv can be used to test which commands keys are +# mpv --input-test --pause dummy.mkv can be used to test which commands keys are # bound to. # # If you wish to unbind a key, use key ignore. @@ -14,7 +14,7 @@ # # Note that merely removing default key bindings from this file won't remove # the default bindings mpv was compiled with, unless -# --input=no-default-bindings +# --no-input-default-bindings # is specified. # # Lines starting with # are comments. Use SHARP to assign the # key. -- cgit v1.2.3