Author: reimar Date: Wed May 30 21:33:09 2012 New Revision: 34974 Log: Another attempt at clearing DVDNAV highlights, this time without making subtitles appear immediately in the film itself. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Tue May 29 20:32:35 2012 (r34973) +++ trunk/mplayer.c Wed May 30 21:33:09 2012 (r34974) @@ -3867,6 +3867,8 @@ goto_enable_cache: #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 @@ goto_enable_cache: 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)