diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2014-04-24 18:16:47 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2014-05-04 02:46:11 +0200 |
commit | 11eaa525298e7ee61a01ee254a73cf0e3a3ec3b2 (patch) | |
tree | eecf2b1dcbad02e69745b8e179f216caa364129d /DOCS/man | |
parent | b54c963258cdd6540cfde3f1fbe3f00a4ba0306a (diff) | |
download | mpv-11eaa525298e7ee61a01ee254a73cf0e3a3ec3b2.tar.bz2 mpv-11eaa525298e7ee61a01ee254a73cf0e3a3ec3b2.tar.xz |
options: rename msg-related options
--msgcolor → --msg-color
--msglevel → --msg-level
--msgmodule → --msg-module
--msgtime → --msg-time (also document this one)
--playing-msg → --term-playing-msg
--status-msg → --term-status-msg
Diffstat (limited to 'DOCS/man')
-rw-r--r-- | DOCS/man/en/changes.rst | 4 | ||||
-rw-r--r-- | DOCS/man/en/lua.rst | 2 | ||||
-rw-r--r-- | DOCS/man/en/mpv.rst | 4 | ||||
-rw-r--r-- | DOCS/man/en/options.rst | 39 |
4 files changed, 28 insertions, 21 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index ac97515f2c..096e6909e4 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -172,6 +172,9 @@ Command Line Switches ``-mixer-channel`` AO suboptions (``alsa``, ``oss``) ``-mixer`` AO suboptions (``alsa``, ``oss``) ``-mouse-movements`` ``--input-cursor`` + ``-msgcolor`` ``--msg-color`` + ``-msglevel`` ``--msg-level`` (changed semantics) + ``-msgmodule`` ``--msg-module`` ``-name`` ``--x11-name`` ``-noar`` ``--no-input-appleremote`` ``-noautosub`` ``--no-sub-auto`` @@ -180,6 +183,7 @@ Command Line Switches ``-nosound`` ``--no-audio`` ``-osdlevel`` ``--osd-level`` ``-panscanrange`` ``--video-zoom``, ``--video-pan-x/y`` + ``-playing-msg`` ``--term-playing-msg`` ``-pp ...`` ``'--vf=pp=[...]'`` ``-pphelp`` ``--vf=pp:help`` ``-rawaudio ...`` ``--demuxer-rawaudio-...`` diff --git a/DOCS/man/en/lua.rst b/DOCS/man/en/lua.rst index cf0b685906..3934e067c0 100644 --- a/DOCS/man/en/lua.rst +++ b/DOCS/man/en/lua.rst @@ -490,7 +490,7 @@ List of events ``prefix`` The module prefix, identifies the sender of the message. This is what the terminal player puts in front of the message text when using the - ``--v`` option, and is also what is used for ``--msglevel``. + ``--v`` option, and is also what is used for ``--msg-level``. ``level`` The log level as string. See ``msg.log`` for possible log level names. diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst index 491ea18cdb..f8d00942e8 100644 --- a/DOCS/man/en/mpv.rst +++ b/DOCS/man/en/mpv.rst @@ -481,9 +481,9 @@ behavior of mpv. Directory where mpv looks for user settings. Overrides ``HOME``, and mpv will try to load the config file as ``$MPV_HOME/config``. -``MPV_VERBOSE`` (see also ``-v`` and ``--msglevel``) +``MPV_VERBOSE`` (see also ``-v`` and ``--msg-level``) Set the initial verbosity level across all message modules (default: 0). - The resulting verbosity corresponds to that of ``--msglevel=5`` plus the + The resulting verbosity corresponds to that of ``--msg-level=5`` plus the value of ``MPV_VERBOSE``. ``MPV_LEAK_REPORT`` diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 7c9a782c33..8ffebf3ea6 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1373,21 +1373,21 @@ OPTIONS 1). A value of 1 means square pixels (correct for (almost?) all LCDs). See also ``--monitoraspect`` and ``--video-aspect``. -``--no-msgcolor`` +``--no-msg-color`` Disable colorful console output on terminals. -``--msglevel=<module1=level1:module2=level2:...>`` +``--msg-level=<module1=level1:module2=level2:...>`` Control verbosity directly for each module. The ``all`` module changes the verbosity of all the modules not explicitly specified on the command line. - Run mpv with ``--msglevel=all=trace`` to see all messages mpv outputs. You + Run mpv with ``--msg-level=all=trace`` to see all messages mpv outputs. You can use the module names printed in the output (prefixed to each line in ``[...]``) to limit the output to interesting modules. .. note:: Some messages are printed before the command line is parsed and are - therefore not affected by ``--msglevel``. To control these messages, + therefore not affected by ``--msg-level``. To control these messages, you have to use the ``MPV_VERBOSE`` environment variable; see `ENVIRONMENT VARIABLES`_ for details. @@ -1406,8 +1406,11 @@ OPTIONS One special case is the ``identify`` module name. This is silenced by default, and can be enabled with the ``-identify`` option. -``--msgmodule`` - Prepend module name in front of each console message. +``--msg-module`` + Prepend module name to each console message. + +``--msg-time`` + Prepend timing information to each console message. ``--mute=<auto|yes|no>`` Set startup audio mute status. ``auto`` (default) will not change the mute @@ -1653,17 +1656,6 @@ OPTIONS ``--pause`` Start the player in paused state. -``--playing-msg=<string>`` - Print out a string after starting playback. The string is expanded for - properties, e.g. ``--playing-msg='file: ${filename}'`` will print the string - ``file:`` followed by a space and the currently played filename. - - See `Property Expansion`_. - -``--status-msg=<string>`` - Print out a custom string during playback instead of the standard status - line. Expands properties. See `Property Expansion`_. - ``--stream-capture=<filename>`` Allows capturing the primary stream (not additional audio tracks or other kind of streams) into the given file. Capturing can also be started and @@ -1783,7 +1775,7 @@ OPTIONS Particularly useful on slow terminals or broken ones which do not properly handle carriage return (i.e. ``\r``). - Also see ``--really-quiet`` and ``--msglevel``. + Also see ``--really-quiet`` and ``--msg-level``. ``--quvi-fetch-subtitles=<yes|no>`` Toggles fetching of subtitles from streaming sites with libquvi. Disabled @@ -2380,6 +2372,17 @@ OPTIONS Default: ``[-+-]``. +``--term-playing-msg=<string>`` + Print out a string after starting playback. The string is expanded for + properties, e.g. ``--playing-msg='file: ${filename}'`` will print the string + ``file:`` followed by a space and the currently played filename. + + See `Property Expansion`_. + +``--term-status-msg=<string>`` + Print out a custom string during playback instead of the standard status + line. Expands properties. See `Property Expansion`_. + ``--no-terminal``, ``--terminal`` Disable any use of the terminal and stdin/stdout/stderr. This completely silences any message output. |