summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-13 19:46:16 +0100
committerwm4 <wm4@nowhere>2014-01-13 19:46:16 +0100
commit8721f9151fe1f6aaf37bef7749dc57d9417a6dd9 (patch)
treeaeee6baf4cc4834db6bf80398d1bdf9bcc6328bd /player
parenta1c22f763df0f8811176e2292162afe3751f432e (diff)
downloadmpv-8721f9151fe1f6aaf37bef7749dc57d9417a6dd9.tar.bz2
mpv-8721f9151fe1f6aaf37bef7749dc57d9417a6dd9.tar.xz
player: don't block terminal OSD while seeking
Seeking usually show the status on OSD. In terminal OSD mode, no status is shown, because there is already a separate status line. Unfortunately, the mechanism for showing the status was still active, which forced showing no message while the code for showing seek status was active.
Diffstat (limited to 'player')
-rw-r--r--player/osd.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/player/osd.c b/player/osd.c
index 70c1a0ddaf..93340d78c2 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -435,9 +435,12 @@ static void add_seek_osd_messages(struct MPContext *mpctx)
set_osd_bar_chapters(mpctx, OSD_BAR_SEEK);
}
if (mpctx->add_osd_seek_info & OSD_SEEK_INFO_TEXT) {
- mp_osd_msg_t *msg = add_osd_msg(mpctx, OSD_MSG_TEXT, 1,
- mpctx->opts->osd_duration);
- msg->show_position = true;
+ // Never in term-osd mode
+ if (mpctx->video_out && mpctx->opts->term_osd != 1) {
+ mp_osd_msg_t *msg = add_osd_msg(mpctx, OSD_MSG_TEXT, 1,
+ mpctx->opts->osd_duration);
+ msg->show_position = true;
+ }
}
if (mpctx->add_osd_seek_info & OSD_SEEK_INFO_CHAPTER_TEXT) {
char *chapter = chapter_display_name(mpctx, get_current_chapter(mpctx));