diff options
| author | wm4 <wm4@nowhere> | 2013-10-02 01:32:03 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-10-02 01:39:28 +0200 |
| commit | 886c3ef999598c68686d8194a74aa1d431b76ca5 (patch) | |
| tree | 74a0a29c449c6320c02a9d04bd29da9149636e31 /mpvcore/mplayer.c | |
| parent | f01744ac4e1da514aedbb51e6fad42fdb308937e (diff) | |
| download | mpv-886c3ef999598c68686d8194a74aa1d431b76ca5.tar.bz2 mpv-886c3ef999598c68686d8194a74aa1d431b76ca5.tar.xz | |
command: subtitle support depends on VO, not video decoding
We can render subtitles if a VO is open. Whether we're decoding video
(i.e. if mpctx->sh_video is set) doesn't really matter.
Subtitle display with --force-window still doesn't quite work yet,
because there's nothing to actually force redrawing of subtitles in this
mode.
Diffstat (limited to 'mpvcore/mplayer.c')
| -rw-r--r-- | mpvcore/mplayer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index 98af9d4e37..6a6c2dfb34 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -1454,7 +1454,7 @@ static void set_osd_subtitle(struct MPContext *mpctx, const char *text) text = ""; if (strcmp(mpctx->osd->sub_text, text) != 0) { osd_set_sub(mpctx->osd, text); - if (!mpctx->sh_video) { + if (!mpctx->video_out) { rm_osd_msg(mpctx, OSD_MSG_SUB_BASE); if (text && text[0]) set_osd_msg(mpctx, OSD_MSG_SUB_BASE, 1, INT_MAX, "%s", text); @@ -1860,7 +1860,7 @@ static void update_subtitles(struct MPContext *mpctx) } } - if (!mpctx->osd->render_bitmap_subs || !mpctx->sh_video) + if (!mpctx->osd->render_bitmap_subs || !mpctx->video_out) set_osd_subtitle(mpctx, sub_get_text(dec_sub, curpts_s)); } |