From 6f1486b397d632feaa71f88b980491aea7b69256 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 17 Sep 2012 08:38:19 +0200
Subject: commands: replace --hardframedrop, change framedropping property

Replace --hardframedrop with --framedrop=hard. Rename the framedrop
property from "framedropping" to "framedrop" for the sake of making
command line options have the same name as their corresponding
property. Change the property to accept choice values instead of
numeric values.

Remove unused/forgotten auto_quality variable.
---
 DOCS/man/en/changes.rst |  3 ++-
 DOCS/man/en/options.rst | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index c4fc3a0812..ee66c5048a 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -87,7 +87,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
@@ -95,6 +95,7 @@ Command line switches
     -nosound                            --no-audio
     -use-filename-title                 --title="${filename}"
     -loop 0                             --loop=inf
+    -hardframedrop                      --framedrop=hard
     =================================== ===================================
 
 input.conf and slave commands
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 431ff1a7de..59ce49a308 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -643,11 +643,14 @@
 --fps=<float>
     Override video framerate. Useful if the original value is wrong or missing.
 
---framedrop
+--framedrop=<no|yes|hard>
     Skip displaying some frames to maintain A/V sync on slow systems. Video
     filters are not applied to such frames. For B-frames even decoding is
-    skipped completely. May produce unwatchably choppy output. See also
-    ``--hardframedrop``.
+    skipped completely. May produce unwatchably choppy output. With ``hard``,
+    decoding and output of any frame can be skipped, and will lead to an even
+    worse playback experience.
+
+    Practical use of this feature is questionable. Disabled by default.
 
 --frames=<number>
     Play/convert only first <number> frames, then quit.
@@ -753,9 +756,6 @@
     ``--no-grabpointer`` tells the player to not grab the mouse pointer after a
     video mode change (``--vm``). Useful for multihead setups.
 
---hardframedrop
-    More intense frame dropping (breaks decoding). Leads to image distortion!
-
 --heartbeat-cmd
     Command that is executed every 30 seconds during playback via *system()* -
     i.e. using the shell.
-- 
cgit v1.2.3


From 10437c35df5d3944625fa6cee05e565b0791fe15 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 17 Sep 2012 08:45:35 +0200
Subject: commands: rename "osdlevel" option and property, make it a choice

Rename both the option and property to "osd-level", which fits a bit
better with the general naming scheme. Make it a choice instead of an
integer range. I failed to come up with good names for the various
levels, so leave them as-is.

Remove the useless property handler for the "loop" property too.
---
 DOCS/man/en/changes.rst | 1 +
 DOCS/man/en/options.rst | 2 +-
 DOCS/man/en/vo.rst      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index ee66c5048a..ec08c7eac2 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -96,6 +96,7 @@ Command line switches
     -use-filename-title                 --title="${filename}"
     -loop 0                             --loop=inf
     -hardframedrop                      --framedrop=hard
+    -osdlevel                           --osd-level
     =================================== ===================================
 
 input.conf and slave commands
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 59ce49a308..70b791c1ba 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1294,7 +1294,7 @@
 --osd-fractions
     Show OSD times with fractions of seconds.
 
---osdlevel=<0-3>
+--osd-level=<0-3>
     Specifies which mode the OSD should start in.
 
     :0: subtitles only
diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst
index 0ba7fe8b9f..c6d80866a6 100644
--- a/DOCS/man/en/vo.rst
+++ b/DOCS/man/en/vo.rst
@@ -411,7 +411,7 @@ gl
     (no-)osd
         Enable or disable support for OSD rendering via OpenGL (default:
         enabled). This option is for testing; to disable the OSD use
-        ``--osdlevel=0`` instead.
+        ``--osd-level=0`` instead.
 
     backend=<sys>
         auto
-- 
cgit v1.2.3


From 1a5a7a49293c2c70a5caf9d51dad7bd5aa938471 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 18 Sep 2012 15:50:24 +0200
Subject: options: accept "yes" and "no" only for flags

This removes the alternative values like "off", "0", "false" etc., and
also the non-English versions of these.

This is done for general consistency. It's better to have a single way
of doing things when multiple ways don't add singificant value.

Also update some choices for consistency.
---
 DOCS/man/en/options.rst | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 70b791c1ba..da7ed79e03 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -87,8 +87,8 @@
     :``--afm=ffmpeg``:    Try FFmpeg's libavcodec codecs first.
     :``--afm=acm,dshow``: Try Win32 codecs first.
 
---aid=<ID|auto|off>
-    Select audio channel. ``auto`` selects the default, ``off`` disables audio.
+--aid=<ID|auto|no>
+    Select audio channel. ``auto`` selects the default, ``no`` disables audio.
     See also ``--alang``.
 
 --alang=<languagecode[,languagecode,...]>
@@ -789,7 +789,7 @@
     backwards since it has to rewind to the beginning to find an exact frame
     position.
 
---hr-seek=<off|absolute|always>
+--hr-seek=<no|absolute|yes>
     Select when to use precise seeks that are not limited to keyframes. Such
     seeks require decoding video from the previous keyframe up to the target
     position and so can take some time depending on decoding performance. For
@@ -797,11 +797,11 @@
     default choice to use for seeks; it's possible to explicitly override that
     default in the definition of key bindings and in slave mode commands.
 
-    :off:      Never use precise seeks.
+    :no:       Never use precise seeks.
     :absolute: Use precise seeks if the seek is to an absolute position in the
                file, such as a chapter seek, but not for relative seeks like
                the default behavior of arrow keys (default).
-    :always:   Use precise seeks whenever possible.
+    :yes:      Use precise seeks whenever possible.
 
 --hr-seek-demuxer-offset=<seconds>
     This option exists to work around failures to do precise seeks (as in
@@ -1139,8 +1139,8 @@
 
     *NOTE*: This option is obsolete now that MPlayer has OpenDML support.
 
---loop=<number|inf|off>
-    Loops playback <number> times. ``inf`` means forever and ``off`` disables
+--loop=<number|inf|no>
+    Loops playback <number> times. ``inf`` means forever and ``no`` disables
     looping.
 
 --mc=<seconds/frame>
@@ -1694,9 +1694,9 @@
 --shuffle
     Play files in random order.
 
---sid=<ID|auto|off>
+--sid=<ID|auto|no>
     Display the subtitle stream specified by <ID> (0-31). ``auto`` selects the
-    default, ``off`` disables subtitles.
+    default, ``no`` disables subtitles.
     See also ``--slang``, ``--vobsubid``, ``--no-sub``.
 
 --slang=<languagecode[,languagecode,...]>
@@ -2256,8 +2256,8 @@
     :``--vfm=xanim``:
         Try XAnim codecs first.
 
---vid=<ID|auto|off>
-    Select video channel. ``auto`` selects the default, ``off`` disables video.
+--vid=<ID|auto|no>
+    Select video channel. ``auto`` selects the default, ``no`` disables video.
 
 --vm
     Try to change to a different video mode. Supported by the x11 and xv video
-- 
cgit v1.2.3


From dec53f760e12254e4baa4f7cee59010b3b10b6be Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 18 Sep 2012 20:07:24 +0200
Subject: commands: add more property-option bridge uses, rename some options

Make more properties use the property-to-option bridge to reduce code
size and to enforce consistency. Some options are renamed to the same
as the properties (the property names are better in all cases).

Do some other minor cleanups. One bigger issue was memory management of
strings: M_PROPERTY_TO_STRING assumed the strings were statically
allocated, and no dynamic allocations could be returned. Fix this in
case the need for such properties arises in the future. Get rid of
m_property_string_ro(), because it's not always clear that the "action"
parameter is M_PROPERTY_SET and the string argument will be used.
---
 DOCS/man/en/changes.rst |  4 ++++
 DOCS/man/en/options.rst | 12 +++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index ec08c7eac2..11b7242d1a 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -97,6 +97,10 @@ Command line switches
     -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
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index da7ed79e03..342626d5d2 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -472,7 +472,7 @@
     will stay hidden. Supported by video output drivers which use X11 or
     OS X Cocoa.
 
---delay=<sec>
+--audio-delay=<sec>
     audio delay in seconds (positive or negative float value). Negative values
     delay the audio, and positive values delay the video.
 
@@ -624,7 +624,7 @@
     there is a change in video parameters, video stream or file. This used to
     be the default behavior. Currently only affects X11 VOs.
 
---forcedsubsonly
+--sub-forced-only
     Display only forced subtitles for the DVD subtitle stream selected by e.g.
     ``--slang``.
 
@@ -659,6 +659,7 @@
     Specifies the character set that will be passed to FriBiDi when decoding
     non-UTF-8 subtitles (default: ISO8859-8).
 
+--fullscreen
 --fs
     Fullscreen playback (centers movie, and paints black bands around it).
 
@@ -1312,9 +1313,6 @@
     controls how much of the image is cropped. May not work with all video
     output drivers.
 
-    *NOTE*: Values between -1 and 0 are allowed as well, but highly
-    experimental and may crash or worse. Use at your own risk!
-
 --panscanrange=<-19.0-99.0>
     (experimental)
     Change the range of the pan-and-scan functionality (default: 1). Positive
@@ -1894,7 +1892,7 @@
     - ``--subcp=enca:pl:cp1250`` guess the encoding for Polish, fall back on
       cp1250.
 
---subdelay=<sec>
+--sub-delay=<sec>
     Delays subtitles by <sec> seconds. Can be negative.
 
 --subfile=<filename>
@@ -1941,7 +1939,7 @@
     *NOTE*: <rate> > movie fps speeds the subtitles up for frame-based
     subtitle files and slows them down for time-based ones.
 
---subpos=<0-100>
+--sub-pos=<0-100>
     Specify the position of subtitles on the screen. The value is the vertical
     position of the subtitle in % of the screen height.
     Can be useful with ``--vf=expand``.
-- 
cgit v1.2.3


From 65074ec1f074d22101b4c8bd95eb4a0354401246 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 27 Sep 2012 03:20:12 +0200
Subject: manpage: document input.conf related things

This directly corresponds to DOCS/OUTDATED-tech/slave.txt.

Changes from the recent commits are included too.
---
 DOCS/man/en/changes.rst |  45 +++++--
 DOCS/man/en/input.rst   | 303 ++++++++++++++++++++++++++++++++++++++++++++++++
 DOCS/man/en/mplayer.rst |   2 +
 DOCS/man/en/options.rst |  34 ++++--
 4 files changed, 367 insertions(+), 17 deletions(-)
 create mode 100644 DOCS/man/en/input.rst

(limited to 'DOCS')

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 11b7242d1a..de56621278 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -106,15 +106,42 @@ Command line switches
 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
 ~~~~~
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
new file mode 100644
index 0000000000..ab392a5696
--- /dev/null
+++ b/DOCS/man/en/input.rst
@@ -0,0 +1,303 @@
+.. _input:
+
+INPUT.CONF
+==========
+
+The input.conf file consists of a list of key bindings, for example:
+
+| s screenshot      # take a screenshot with the s key
+
+Each line maps a key to an input command. Keys are specified with their literal
+value (upper case if combined with ``Shift``), or a name for special keys. For
+example, ``a`` maps to the ``a`` key without shift, and ``A`` maps to ``a``
+with shift.
+
+A list of special keys can be obtained with
+
+| **mplayer** --input=keylist
+
+In general, keys can be combined with ``Shift``, ``Ctrl`` and ``Alt``:
+
+| ctrl+q quit
+
+General input command syntax
+----------------------------
+
+`[Shift+][Ctrl+][Alt+][Meta+]<key> [<prefix>] <command> (<argument>)*`
+
+Newlines always start a new binding. ``#`` starts a comment (outside of quoted
+string arguments). To bind commands to the ``#`` key, ``SHARP`` can be used.
+
+<key> is either the literal character the key produces (ASCII or unicode
+character), or a symbol name.
+
+Arguments are separated by whitespace. This applies even to string arguments.
+For this reason, string arguments should be quoted with ``"``. Inside quotes,
+C style escaping can be used.
+
+Optional arguments can be skipped with ``-``.
+
+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``.
+
+seek <seconds> [relative|absolute|absolute-percent] [default-precise|exact|keyframes]
+    Change the playback position. By default, seeks by a relative amount of
+    seconds.
+
+    The second argument sets the seek mode:
+
+    relative (default)
+        Seek relative to current position (a negative value seeks backwards).
+    absolute
+        Seek to a given time.
+    absolute-percent
+        Seek to agiven percent position.
+
+    The third argument defines how exact the seek is:
+
+    default-precise (default)
+        Follow the default behavior as set by ``--hr-seek``, which by default
+        does imprecise seeks (like ``keyframes``).
+    exact
+        Always do exact/hr/precise seeks (slow).
+    keyframes
+        Always restart playback at keyframe boundaries (fast).
+
+frame_step
+    Basically seek forward by one frame. Actually this plays one frame, then
+    pauses again.
+
+set <property> "<value>"
+    Set the given property to the given value.
+
+add <property> [<value>]
+    Add the given value to the property. On overflow or underflow, clamp the
+    property to the maximum. If <value> is omitted, assume ``1``.
+
+cycle <property> [<value>]
+    Cycle the given property. Negative values cycle the property backwards. On
+    overflow, set the property back to the minimum, on underflow set it to the
+    maximum. If <value> is omitted, assume ``1``.
+
+speed_mult <value>
+    Multiply the ``speed`` property by the given value.
+
+screenshot [single|each-frame] [video|window]
+    Take a screenshot.
+
+    First argument:
+
+    <single> (default)
+        Take a single screenshot.
+    <each-frame>
+        Take a screenshot each frame. Issue this command again to stop taking
+        screenshots.
+
+    Second argument:
+
+    <video> (default)
+        Save the video image, in its original resolution. Typically without
+        OSD or subtitles, but the exact behavior depends on the selected video
+        output.
+    <window>
+        Save the contents of the mplayer window. Typically scaled, with OSD and
+        subtitles. The exact behavior depends on the selected video output, and
+        if not support is available, this will act like ``video``.
+
+playlist_next [weak|force]
+    Go to the next entry on the playlist.
+
+    weak (default)
+        If the last file on the playlist is currently played, do nothing.
+    force
+        Terminate playback if there are no more files on the playlist.
+
+playlist_prev [weak|force]
+    Go to the previous entry on the playlist.
+
+    weak (default)
+        If the first file on the playlist is currently played, do nothing.
+    force
+        Terminate playback if the first file is being played.
+
+loadfile "<file>" [replace|append]
+    Load the given file and play it.
+
+    Second argument:
+
+    <replace> (default)
+        Stop playback of the current file, and play the new file immediately.
+    <append>
+        Append the file to the playlist.
+
+loadlist "<playlist>" [replace|append]
+    Load the given playlist file (like ``--playlist``).
+
+playlist_clear
+    Clear the playlist, except the currently played file.
+
+run "<command>"
+    Run the given command with ``/bin/sh -c``. The string is expanded like in
+    ``--playing-msg`` before
+
+quit [<code>]
+    Exit the player using the given exit code.
+
+sub_load "<file>"
+    Load the given subtitle file. It's not selected as current subtitle after
+    loading.
+
+sub_step <skip>
+    Change subtitle timing such, that the subtitle event after the next <skip>
+    subtitle events is displayed. <skip> can be negative to step back.
+
+osd [<level>]
+    Toggle OSD level. If <level> is specified, set the OSD mode
+    (see ``--osd-level`` for valid values).
+
+show_text "<string>" [<duration>] [<level>]
+    Show text on the OSD. The string can contain properties, which are expanded
+    like in ``--playing-msg``. This can be used to show playback time, filename,
+    and so on.
+
+    <duration> is the time in ms to show the message. By default, it uses the
+    same value as ``--osd-duration``.
+
+    <level> is the minimum OSD level to show the text (see ``--osd-level``).
+
+show_progress
+    Show the progress bar, the elapsed time and the total duration of the file
+    on the OSD.
+
+show_chapters
+    Show a list of chapters on the OSD.
+
+show_tracks
+    Show a list of video/audio/subtitle tracks on the OSD.
+
+
+
+Undocumented properties: tv_start_scan, tv_step_channel, tv_step_norm,
+tv_step_chanlist, tv_set_channel, tv_last_channel, tv_set_freq, tv_step_freq,
+tv_set_norm, dvb_set_channel, radio_step_channel, radio_set_channel,
+radio_set_freq, radio_step_freq (all of these should be replaced by properties),
+edl_mark, stop (questionable use), get_property (?), af_switch, af_add, af_del,
+af_clr, af_cmdline, vo_cmdline (experimental).
+
+Input command prefixes
+----------------------
+
+osd-auto (default)
+    Use the default behavior for this command.
+no-osd
+    Do not use any OSD for this command.
+osd-bar
+    If possible, show a bar with this command. Seek commands will show the
+    progress bar, property changing commands may show the newly set value.
+osd-msg
+    If possible, show an OSD message with this command. The seek command shows
+    the current playback time (like ``show_progress``), property changing
+    commands show the newly set value as text.
+osd-msg-bar
+    Combine osd-bar and osd-msg.
+
+
+
+All of these are still overridden by the global ``--osd-level`` settings.
+
+Undocumented prefixes: pausing, pausing_keep, pausing_toggle,
+pausing_keep_force. (Should these be made official?)
+
+Properties
+----------
+
+Properties are used to set mplayer options during runtime, or to query arbitrary
+information. They can be manipulated with the ``set``/``add``/``cycle``
+commands, and retrieved with ``show_text``, or anything else that uses property
+expansion. (See ``--playing-msg`` how properties are expanded.)
+
+``W`` indicates whether the property is generally writeable. If an option
+is referenced, the property should take/return exactly the same values as the
+option.
+
+=========================== = ==================================================
+Name                        W Comment
+=========================== = ==================================================
+osd-level                   x see ``--osd-level``
+loop                        x see ``--loop``
+speed                       x see ``--speed``
+filename                      currently played file (path stripped)
+path                          currently played file (full path)
+demuxer
+stream-pos                  x byte position in source stream
+stream-start                  start byte offset in source stream
+stream-end                    end position in bytes in source stream
+stream-length                 length in bytes (${stream-end} - ${stream-start})
+stream-time-pos             x time position in source stream (also see time-pos)
+length                        length of the current file in seconds
+percent-pos                 x position in current file (0-100)
+time-pos                    x position in current file in seconds
+chapter                     x current chapter number
+edition                     x current MKV edition number
+titles                        number of DVD titles
+chapters                      number of chapters
+editions                      number of MKV editions
+angle                         current DVD angle
+metadata                      metadata key/value pairs
+metadata/<key>                value of metedata entry <key>
+pause                       x pause status (bool)
+pts-association-mode        x see ``--pts-association-mode``
+hr-seek                     x see ``--hr-seek``
+volume                      x current volume (0-100)
+mute                        x current mute status (bool)
+audio-delay                 x see ``--audio-delay``
+audio-format                  audio format (codec tag)
+audio-codec                   audio codec selected for decoding
+audio-bitrate                 audio bitrate
+samplerate                    audio samplerate
+channels                      number of audio channels
+audio                       x current audio track (similar to ``--aid``)
+balance                     x audio channel balance
+fullscreen                  x see ``--fullscreen``
+deinterlace                 x deinterlacing, if available (bool)
+colormatrix                 x see ``--colormatrix``
+colormatrix-input-range     x see ``--colormatrix-input-range``
+colormatrix-output-range    x see ``--colormatrix-output-range``
+ontop                       x see ``--ontop``
+rootwin                     x see ``--rootwin``
+border                      x see ``--border``
+framedrop                   x see ``--framedrop``
+gamma                       x see ``--gamma``
+brightness                  x see ``--brightness``
+contrast                    x see ``--contrast``
+saturation                  x see ``--saturation``
+hue                         x see ``--hue``
+panscan                     x see ``--panscan``
+vsync                       x see ``--vsync``
+video-format                  video format (integer FourCC)
+video-codec                   video codec selected for decoding
+video-bitrate                 video bitrate
+width                         video width
+height                        video height
+fps                           FPS (may contain bogus values)
+aspect                      x video aspect
+video                       x current video track (similar to ``--vid``)
+program                     x switch TS program (write-only)
+sub                         x current subttitle track (similar to ``--sid``)
+sub-delay                   x see ``--sub-delay``
+sub-pos                     x see ``--sub-pos``
+sub-visibility              x whether current subtitle is rendered
+sub-forced-only             x see ``--sub-forced-only``
+sub-scale                   x subtitle font size multiplicator
+ass-use-margins             x see ``--ass-use-margins``
+ass-vsfilter-aspect-compat  x see ``--ass-vsfilter-aspect-compat``
+tv-brightness
+tv-contrast
+tv-saturation
+tv-hue
+=========================== = ==================================================
diff --git a/DOCS/man/en/mplayer.rst b/DOCS/man/en/mplayer.rst
index 89b03737c3..840f36f23c 100644
--- a/DOCS/man/en/mplayer.rst
+++ b/DOCS/man/en/mplayer.rst
@@ -409,6 +409,8 @@ OPTIONS
 
 .. include:: encode.rst
 
+.. include:: input.rst
+
 Taking screenshots
 ==================
 
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 342626d5d2..453c8e052f 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1326,15 +1326,33 @@
     See also ``--user``.
 
 --playing-msg=<string>
-    Print out a string before starting playback. The following expansions are
-    supported:
+    Print out a string before starting playback. The string is expanded for
+    properties, e.g. ``--playing-msg=file: ${filename}`` will print the string
+    ``file: `` followed by the currently played filename.
+
+    The following expansions are supported:
 
     ${NAME}
-        Expand to the value of the property ``NAME``.
-    ?(NAME:TEXT)
-        Expand ``TEXT`` only if the property ``NAME`` is available.
-    ?(!NAME:TEXT)
-        Expand ``TEXT`` only if the property ``NAME`` is not available.
+        Expands to the value of the property ``NAME``. If ``NAME`` starts with
+        ``=``, use the raw value of the property. If retrieving the property
+        fails, expand to an error string. (Use ``${NAME:}`` with a trailing
+        ``:`` to expand to an empty string instead.)
+    ${NAME:STR}
+        Expands to the value of the property ``NAME``, or ``STR`` if the
+        property can't be retrieved. ``STR`` is expanded recursively.
+    ${!NAME:STR}
+        Expands to ``STR`` (recursively) if the property ``NAME`` can't be
+        retrieved.
+    ${?NAME:STR}
+        Expands to ``STR`` (recursively) if the property ``NAME`` is available.
+    $$
+        Expands to ``$``.
+    $}
+        Expands to ``}``. (To produce this character inside rexursive
+        expansion.)
+    $>
+        Disable property expansion and special handling of ``$`` for the rest
+        of the string.
 
 --playlist=<filename>
     Play files according to a playlist file (ASX, Winamp, SMIL, or
@@ -1980,7 +1998,7 @@
     the line used for the OSD and clear it (default: ``^[[A\r^[[K``).
 
 --title
-    Set the window title. The string can contain property names.
+    Set the window title. Properties are expanded (see ``--playing-msg``).
 
 --tv=<option1:option2:...>
     This option tunes various properties of the TV capture module. For
-- 
cgit v1.2.3


From fd56c168aedb41a7d98dc4af32644d970eb81331 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 2 Oct 2012 03:12:09 +0200
Subject: options: add --status-msg

Replaces the status line with a custom string.

This is probably useful for hacking old slave mode applications into
working again. Even if not, this might be generally useful.
---
 DOCS/man/en/options.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'DOCS')

diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 453c8e052f..875b9c4b4a 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1354,6 +1354,10 @@
         Disable property expansion and special handling of ``$`` for the rest
         of the string.
 
+--status-msg=<string>
+    Print out a custom string during playback instead of the standard status
+    line. Expands properties. See ``--playing-msg``.
+
 --playlist=<filename>
     Play files according to a playlist file (ASX, Winamp, SMIL, or
     one-file-per-line format).
-- 
cgit v1.2.3


From c9df2c8bd83b31375a79ab2bc4f854a53ff019c1 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 11 Oct 2012 02:23:29 +0200
Subject: sub: add --ass-style-override option to disable style overrides

There are a number of options which modify ASS subtitle rendering. Most
of these do things that can interfere with the styling done by subtitle
scripts, resulting in incorrect rendering. Add the --ass-style-override
option to make it easy to disable all overrides. This helps trouble-
shooting, and makes it more practical to use the override features. (You
can simply toggle the ass-style-override property at runtime, should
one of the style override options break subtitle rendering at a certain
point.)

This mainly affects whether most --ass-* options are applied, as well
as --sub-pos. Some things, like explicit style overrides loaded with
--ass-force-style, can't be changed at runtime using the
ass-style-override property.
---
 DOCS/man/en/input.rst   | 1 +
 DOCS/man/en/options.rst | 8 ++++++++
 2 files changed, 9 insertions(+)

(limited to 'DOCS')

diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index ab392a5696..9a4e4dcc93 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -296,6 +296,7 @@ sub-forced-only             x see ``--sub-forced-only``
 sub-scale                   x subtitle font size multiplicator
 ass-use-margins             x see ``--ass-use-margins``
 ass-vsfilter-aspect-compat  x see ``--ass-vsfilter-aspect-compat``
+ass-style-override          x see ``--ass-style-override``
 tv-brightness
 tv-contrast
 tv-saturation
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 875b9c4b4a..6151e0d21a 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -176,6 +176,14 @@
     rendering text subtitles. The syntax of the file is exactly like the ``[V4
     Styles]`` / ``[V4+ Styles]`` section of SSA/ASS.
 
+--ass-style-override=<yes|no>
+    Control whether user style overrides should be applied.
+
+    :yes: Apply all the ``--ass-*`` style override options. Changing the default
+          for any of these options can lead to incorrect subtitle rendering.
+          (Default.)
+    :no:  Render subtitles as forced by subtitle scripts.
+
 --ass-top-margin=<value>
     Adds a black band at the top of the frame. The SSA/ASS renderer can place
     toptitles there (with ``--ass-use-margins``).
-- 
cgit v1.2.3


From 32fe890cc1f9c90699fb9cd9eb5f42e597d9665a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 11 Oct 2012 02:24:13 +0200
Subject: commands: add print_text input command to print text on the terminal

In theory, this could take over the role of the get_property slave
command, and is more general.
---
 DOCS/man/en/input.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'DOCS')

diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index 9a4e4dcc93..db16697bd7 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -160,6 +160,10 @@ osd [<level>]
     Toggle OSD level. If <level> is specified, set the OSD mode
     (see ``--osd-level`` for valid values).
 
+print_text "<string>"
+    Print text to stdout. The string can contain properties, which are expanded
+    like in ``--playing-msg``.
+
 show_text "<string>" [<duration>] [<level>]
     Show text on the OSD. The string can contain properties, which are expanded
     like in ``--playing-msg``. This can be used to show playback time, filename,
-- 
cgit v1.2.3


From e1b15dee4c250bf6509594e241eb2856c8d21e0f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 12 Oct 2012 09:21:26 +0200
Subject: commands: use "up" and "down" as 2nd argument for cycle command

Allow the values "up" and "down" as step argument for the cycle input
command. Previously, this argument was a float, which specified an
arbitrary step value and direction (similar to the add command).
Instead of "1" and "-1", "up" and "down" is to be used.

Float values are still accepted. That capability might be removed in the
future, as there's probably hardly any actual use for arbitrary step
values.
---
 DOCS/man/en/input.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index db16697bd7..58565f0267 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -79,10 +79,10 @@ add <property> [<value>]
     Add the given value to the property. On overflow or underflow, clamp the
     property to the maximum. If <value> is omitted, assume ``1``.
 
-cycle <property> [<value>]
-    Cycle the given property. Negative values cycle the property backwards. On
+cycle <property> [up|down]
+    Cycle the given property. ``up`` and ``down`` set the cycle direction. On
     overflow, set the property back to the minimum, on underflow set it to the
-    maximum. If <value> is omitted, assume ``1``.
+    maximum. If ``up`` or ``down`` is omitted, assume ``up``.
 
 speed_mult <value>
     Multiply the ``speed`` property by the given value.
-- 
cgit v1.2.3