Mercurial > mplayer.hg
changeset 17732:4a8c4d03c88c
restored the ability to disable subtitles when cycling with slave command 'sub_select' (previously broken in release 1.900)
| author | nicodvb |
|---|---|
| date | Sun, 05 Mar 2006 08:55:08 +0000 |
| parents | a3dd033ec92e |
| children | 4c4f5c73c152 |
| files | mplayer.c |
| diffstat | 1 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mplayer.c Sun Mar 05 07:23:12 2006 +0000 +++ b/mplayer.c Sun Mar 05 08:55:08 2006 +0000 @@ -3783,12 +3783,15 @@ 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 @@ 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 (!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);