From 8c8dcc698b394be4de5804313e8d8a7a4c094e2f Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Sun, 21 Jan 2018 15:40:52 -0800 Subject: Revert "command: make pause display the same osd-msg-bar as seek" This reverts commit 9812e276aa1bb0bddeb73677aa9e9f87e73cd930. This was apparently unpopular. I still think the pause OSD should be the same as seek even if it's not visible by default, but it seems that whether to display a given property change is currently conflated with what to display. The reverted behaviour can be restored by adding something like the following to input.conf: SPACE cycle pause; show_progress --- DOCS/man/options.rst | 6 +++--- player/command.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 95b29f3d25..65fb3e3778 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -3131,15 +3131,15 @@ OSD shown. This is also used for the ``show-progress`` command (by default mapped to - ``P``), when toggling pause, and when seeking. + ``P``), and when seeking. ``--osd-status-msg`` is a legacy equivalent (but with a minor difference). ``--osd-status-msg=`` 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``), when toggling pause, - and when seeking. Expands properties. See `Property Expansion`_. + ``show-progress`` command (by default mapped to ``P``), 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 8e28fb9917..2da7834233 100644 --- a/player/command.c +++ b/player/command.c @@ -4324,9 +4324,7 @@ 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", - .seek_msg = OSD_SEEK_INFO_TEXT, - .seek_bar = OSD_SEEK_INFO_BAR}, + {"pause", NULL}, {"fullscreen", NULL}, {0} }; -- cgit v1.2.3