diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-05 08:55:08 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-05 08:55:08 +0000 |
commit | 41d2f9a704a70f45012f9f48764b41c364c058f5 (patch) | |
tree | b1de4b218a8d2d8b806f9f95ecbddedb49d6ff39 /mplayer.c | |
parent | 66419046a2c6aba11470097a606973baf789a9fd (diff) | |
download | mpv-41d2f9a704a70f45012f9f48764b41c364c058f5.tar.bz2 mpv-41d2f9a704a70f45012f9f48764b41c364c058f5.tar.xz |
restored the ability to disable subtitles when cycling with slave command 'sub_select' (previously broken in release 1.900)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17733 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -3783,12 +3783,15 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) case MP_CMD_SUB_SELECT: if (global_sub_size) { int source = -1; + int reset=0; int v = cmd->args[0].v.i; if (v < -1) global_sub_pos++; else global_sub_pos = v; + if(global_sub_pos == global_sub_size) + reset = 1; if (global_sub_pos >= global_sub_size) global_sub_pos = -1; if (global_sub_pos >= 0) @@ -3805,7 +3808,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) vo_sub_last = vo_sub = NULL; #endif vobsub_id = -1; - if(dvdsub_lang) { + if(dvdsub_lang || reset) { dvdsub_id = -1; if (d_dvdsub) d_dvdsub->id = -1; } @@ -3872,6 +3875,13 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) } if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps; } else { // off +#ifdef USE_DVDREAD + if (vo_spudec && stream->type == STREAMTYPE_DVD && dvdsub_id < 0) { + dvdsub_id = -2; + d_dvdsub->id = dvdsub_id; + spudec_reset(vo_spudec); + } +#endif if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps; #ifdef USE_SUB vo_osd_changed(OSDTYPE_SUBTITLE); |