diff options
author | wm4 <wm4@nowhere> | 2012-10-12 10:17:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-12 11:53:53 +0200 |
commit | 85d185441acf4691c830db2f40235ac927410d45 (patch) | |
tree | 211177793cd5d6b399346be661af8e7528f0f411 /DOCS/man/en/changes.rst | |
parent | 65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff) | |
parent | e1b15dee4c250bf6509594e241eb2856c8d21e0f (diff) | |
download | mpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2 mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz |
Merge branch 'input_changes' into master
Conflicts:
DOCS/man/en/vo.rst
etc/input.conf
input/input.c
m_property.c
Diffstat (limited to 'DOCS/man/en/changes.rst')
-rw-r--r-- | DOCS/man/en/changes.rst | 53 |
1 files changed, 43 insertions, 10 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 5b1c3ea4a6..402bdbd336 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -84,7 +84,7 @@ Command line switches ``-no-opt``, or better ``--no-opt``. * Per-file options are not the default anymore. You can explicitly specify file local options. See ``Usage`` section. -* Table of renamed switches: +* Table of renamed/replaced switches: =================================== =================================== Old New @@ -92,20 +92,53 @@ Command line switches -nosound --no-audio -use-filename-title --title="${filename}" -loop 0 --loop=inf + -hardframedrop --framedrop=hard + -osdlevel --osd-level + -delay --audio-delay + -subdelay --sub-delay + -subpos --sub-pos + -forcedsubsonly --sub-forced-only =================================== =================================== input.conf and slave commands ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* Table of renamed slave commands: - - =================================== =================================== - Old New - =================================== =================================== - pt_step 1 b playlist_next b - pt_step -1 b playlist_prev b - pt_clear playlist_clear - =================================== =================================== +* Table of renamed input commands: + + This lists only commands that are not always gracefully handled by the + internal legacy translation layer. If an input.conf contains any legacy + commands, they will be displayed with ``-v`` when it is loaded, and show + and the replacement commands. + + Properties containing ``_`` to separate words use ``-`` instead. + + +--------------------------------+----------------------------------------+ + | Old | New | + +================================+========================================+ + | pt_step 1 [0|1] | playlist_next [weak|force] | + | | (translation layer can't deal with | + | | whitespace) | + +--------------------------------+----------------------------------------+ + | pt_step -1 [0|1] | playlist_prev [weak|force] (same) | + +--------------------------------+----------------------------------------+ + | switch_ratio [<ratio>] | set aspect <ratio> | + | | set aspect 0 (to reset aspect) | + +--------------------------------+----------------------------------------+ + | step_property_osd <prop> <step>| cycle <prop> <step> (wraps), | + | <dir> | add <prop> <step> (clamps). | + | | <dir> parameter unsupported. Use | + | | a negative step instead. | + +--------------------------------+----------------------------------------+ + | step_property <prop> <step> | Prefix cycle or add with no-osd: | + | <dur> | no-osd cycle <prop> <step> | + +--------------------------------+----------------------------------------+ + | osd_show_property_text <text> | show_text <text> | + | | The property expansion format string | + | | syntax slightly changed. | + +--------------------------------+----------------------------------------+ + | osd_show_text | Now does the same as | + | | osd_show_property_text. | + +--------------------------------+----------------------------------------+ Other ~~~~~ |