Mercurial > mplayer.hg

changeset 34886:73842c97cac0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Another attempt at clearing DVDNAV highlights, this time without making subtitles appear immediately in the film itself.
author reimar
date Wed, 30 May 2012 19:33:09 +0000
parents e8af23854aa1
children b510e6c95427
files mplayer.c
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Tue May 29 18:32:35 2012 +0000
+++ b/mplayer.c	Wed May 30 19:33:09 2012 +0000
@@ -3867,6 +3867,8 @@
 
 #ifdef CONFIG_DVDNAV
             if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
+                // do not clobber subtitles
+                if (!mp_dvdnav_number_of_subs(mpctx->stream)) {
                 nav_highlight_t hl;
                 mp_dvdnav_get_highlight(mpctx->stream, &hl);
                 if (!vo_spudec || !spudec_apply_palette_crop(vo_spudec, hl.palette, hl.sx, hl.sy, hl.ex, hl.ey)) {
@@ -3877,9 +3879,13 @@
                     vo_osd_changed(OSDTYPE_DVDNAV);
                     vo_osd_changed(OSDTYPE_SPU);
                 }
+                }
 
                 if (mp_dvdnav_stream_has_changed(mpctx->stream)) {
                     double ar = -1.0;
+                    // clear highlight
+                    if (vo_spudec)
+                        spudec_apply_palette_crop(vo_spudec, 0, 0, 0, 0, 0);
                     if (mpctx->sh_video &&
                         stream_control(mpctx->demuxer->stream,
                                        STREAM_CTRL_GET_ASPECT_RATIO, &ar)