diff options
| author | Kevin Mitchell <kevmitch@gmail.com> | 2018-01-05 18:52:04 -0800 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-01-07 16:07:04 -0800 |
| commit | cd8daee3d37ecd759e0b6cc33e51ac66f88775c9 (patch) | |
| tree | b997c78c5a504aee657aaab4680751e1f4b42b5b /player/command.c | |
| parent | 57f43c35ecc9adb944daee58b864fcc0989e9df6 (diff) | |
| download | mpv-cd8daee3d37ecd759e0b6cc33e51ac66f88775c9.tar.bz2 mpv-cd8daee3d37ecd759e0b6cc33e51ac66f88775c9.tar.xz | |
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.
Diffstat (limited to 'player/command.c')
| -rw-r--r-- | player/command.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; } } |