From cd8daee3d37ecd759e0b6cc33e51ac66f88775c9 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Fri, 5 Jan 2018 18:52:04 -0800 Subject: command: default to osd-msg-bar for seeks The previous default was osd-bar (unless the user specified --no-osd-bar, in which case case it was osd-msg). Aside from requiring some twisted logic to implement, this surprised users since osd-msg3 wasn't displayed when seeking with the keyboard (#3028), so the time seeked to was never displayed. --- DOCS/man/options.rst | 10 ++++------ player/command.c | 7 +++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 54ff495bd1..c6cffd8448 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -3102,8 +3102,7 @@ OSD Whether to load the on-screen-controller (default: yes). ``--no-osd-bar``, ``--osd-bar`` - Disable display of the OSD bar. This will make some things (like seeking) - use OSD text messages instead of the bar. + Disable display of the OSD bar. You can configure this on a per-command basis in input.conf using ``osd-`` prefixes, see ``Input command prefixes``. If you want to disable the OSD @@ -3141,16 +3140,15 @@ OSD shown. This is also used for the ``show-progress`` command (by default mapped to - ``P``), or in some non-default cases 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``), or in some - non-default cases 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 9b12f63a25..4cf6413110 100644 --- a/player/command.c +++ b/player/command.c @@ -4821,7 +4821,6 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re bool auto_osd = on_osd == MP_ON_OSD_AUTO; bool msg_osd = auto_osd || (on_osd & MP_ON_OSD_MSG); bool bar_osd = auto_osd || (on_osd & MP_ON_OSD_BAR); - bool msg_or_nobar_osd = msg_osd && !(auto_osd && opts->osd_bar_visible); int osdl = msg_osd ? 1 : OSD_LEVEL_INVISIBLE; bool async = cmd->flags & MP_ASYNC_CMD; @@ -4887,7 +4886,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re }} if (bar_osd) mpctx->add_osd_seek_info |= OSD_SEEK_INFO_BAR; - if (msg_or_nobar_osd) + if (msg_osd) mpctx->add_osd_seek_info |= OSD_SEEK_INFO_TEXT; break; } @@ -4908,7 +4907,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re set_osd_function(mpctx, OSD_REW); if (bar_osd) mpctx->add_osd_seek_info |= OSD_SEEK_INFO_BAR; - if (msg_or_nobar_osd) + if (msg_osd) mpctx->add_osd_seek_info |= OSD_SEEK_INFO_TEXT; } else { return -1; @@ -5104,7 +5103,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re set_osd_function(mpctx, (a[0] > refpts) ? OSD_FFW : OSD_REW); if (bar_osd) mpctx->add_osd_seek_info |= OSD_SEEK_INFO_BAR; - if (msg_or_nobar_osd) + if (msg_osd) mpctx->add_osd_seek_info |= OSD_SEEK_INFO_TEXT; } } -- cgit v1.2.3