summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2018-01-05 19:10:54 -0800
committerKevin Mitchell <kevmitch@gmail.com>2018-01-07 16:07:04 -0800
commit6e974f77bdb9f194d4c2c0c1dc36703419dbd0df (patch)
tree14a6af1cd5254915ae1a0244f216e89516fab8e4
parentcd8daee3d37ecd759e0b6cc33e51ac66f88775c9 (diff)
downloadmpv-6e974f77bdb9f194d4c2c0c1dc36703419dbd0df.tar.bz2
mpv-6e974f77bdb9f194d4c2c0c1dc36703419dbd0df.tar.xz
command: make pause display the same osd-msg-bar as seek
Previously, toggling pause would generate no osd response, and changing that wasn't even configurable. This was surprising to users who generally expect to see *where* pause / unpause is taking place (#3028).
-rw-r--r--DOCS/man/options.rst6
-rw-r--r--player/command.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index c6cffd8448..b6813494a6 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -3140,15 +3140,15 @@ OSD
shown.
This is also used for the ``show-progress`` command (by default mapped to
- ``P``), and when seeking.
+ ``P``), when toggling pause, and when seeking.
``--osd-status-msg`` is a legacy equivalent (but with a minor difference).
``--osd-status-msg=<string>``
Show a custom string during playback instead of the standard status text.
This overrides the status text used for ``--osd-level=3``, when using the
- ``show-progress`` command (by default mapped to ``P``), and when
- seeking. Expands properties. See `Property Expansion`_.
+ ``show-progress`` command (by default mapped to ``P``), when toggling pause,
+ and when seeking. Expands properties. See `Property Expansion`_.
This option has been replaced with ``--osd-msg3``. The only difference is
that this option implicitly includes ``${osd-sym-cc}``. This option is
diff --git a/player/command.c b/player/command.c
index 4cf6413110..006f557eb8 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4342,7 +4342,9 @@ static const struct property_osd_display {
{"ab-loop-b", .msg = "A-B loop: ${ab-loop-a} - ${ab-loop-b}"},
{"audio-device", "Audio device"},
// By default, don't display the following properties on OSD
- {"pause", NULL},
+ {"pause",
+ .seek_msg = OSD_SEEK_INFO_TEXT,
+ .seek_bar = OSD_SEEK_INFO_BAR},
{"fullscreen", NULL},
{0}
};