From 11eaa525298e7ee61a01ee254a73cf0e3a3ec3b2 Mon Sep 17 00:00:00 2001 From: Martin Herkt Date: Thu, 24 Apr 2014 18:16:47 +0200 Subject: options: rename msg-related options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --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 --- DOCS/lua_examples/status-line.lua | 6 +++--- DOCS/man/en/changes.rst | 4 ++++ DOCS/man/en/lua.rst | 2 +- DOCS/man/en/mpv.rst | 4 ++-- DOCS/man/en/options.rst | 39 +++++++++++++++++++++------------------ options/options.c | 12 ++++++------ 6 files changed, 37 insertions(+), 30 deletions(-) diff --git a/DOCS/lua_examples/status-line.lua b/DOCS/lua_examples/status-line.lua index be3374a7cf..d28bdcc082 100644 --- a/DOCS/lua_examples/status-line.lua +++ b/DOCS/lua_examples/status-line.lua @@ -34,7 +34,7 @@ function update_status_line() atsl(mp.get_property_osd("percent-pos", -1)) atsl("%)") - local r = mp.get_property_number("speed", -1) + local r = mp.get_property_number("speed", -1) if r ~= 1 then atsl(string.format(" x%4.2f", r)) end @@ -54,14 +54,14 @@ function update_status_line() atsl(" Late: ") atsl(r) end - + r = mp.get_property_number("cache", 0) if r > 0 then atsl(string.format(" Cache: %d%% ", r)) end -- Set the new status line - mp.set_property("options/status-msg", newStatus) + mp.set_property("options/term-status-msg", newStatus) end -- Register the event 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=`` +``--msg-level=`` 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=`` 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=`` - 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=`` - Print out a custom string during playback instead of the standard status - line. Expands properties. See `Property Expansion`_. - ``--stream-capture=`` 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=`` Toggles fetching of subtitles from streaming sites with libquvi. Disabled @@ -2380,6 +2372,17 @@ OPTIONS Default: ``[-+-]``. +``--term-playing-msg=`` + 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=`` + 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. diff --git a/options/options.c b/options/options.c index 809a1838e0..946b1192d0 100644 --- a/options/options.c +++ b/options/options.c @@ -215,12 +215,12 @@ const m_option_t mp_opts[] = { OPT_FLAG("quiet", quiet, CONF_GLOBAL), OPT_FLAG_STORE("really-quiet", verbose, CONF_GLOBAL | CONF_PRE_PARSE, -10), OPT_FLAG("terminal", use_terminal, CONF_GLOBAL | CONF_PRE_PARSE), - OPT_GENERAL(char*, "msglevel", msglevels, CONF_GLOBAL|CONF_PRE_PARSE, + OPT_GENERAL(char*, "msg-level", msglevels, CONF_GLOBAL|CONF_PRE_PARSE, .type = &m_option_type_msglevels), OPT_STRING("dump-stats", dump_stats, CONF_GLOBAL | CONF_PRE_PARSE), - OPT_FLAG("msgcolor", msg_color, CONF_GLOBAL | CONF_PRE_PARSE), - OPT_FLAG("msgmodule", msg_module, CONF_GLOBAL), - OPT_FLAG("msgtime", msg_time, CONF_GLOBAL), + OPT_FLAG("msg-color", msg_color, CONF_GLOBAL | CONF_PRE_PARSE), + OPT_FLAG("msg-module", msg_module, CONF_GLOBAL), + OPT_FLAG("msg-time", msg_time, CONF_GLOBAL), OPT_FLAG("identify", msg_identify, CONF_GLOBAL), #if HAVE_PRIORITY {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -595,8 +595,8 @@ const m_option_t mp_opts[] = { OPT_FLAG("term-osd-bar", term_osd_bar, 0), OPT_STRING("term-osd-bar-chars", term_osd_bar_chars, 0), - OPT_STRING("playing-msg", playing_msg, 0), - OPT_STRING("status-msg", status_msg, 0), + OPT_STRING("term-playing-msg", playing_msg, 0), + OPT_STRING("term-status-msg", status_msg, 0), OPT_STRING("osd-status-msg", osd_status_msg, 0), OPT_FLAG("slave-broken", slave_mode, CONF_GLOBAL), -- cgit v1.2.3