comparison mplayer.c @ 17732:4a8c4d03c88c

restored the ability to disable subtitles when cycling with slave command 'sub_select' (previously broken in release 1.900)

17731:a3dd033ec92e

#endif
	} break;
    case MP_CMD_SUB_SELECT:
    if (global_sub_size) {
        int source = -1;
        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)
            global_sub_pos = -1;
        if (global_sub_pos >= 0)
            source = sub_source();

        set_of_sub_pos = -1;
        subdata = NULL;
        vo_sub_last = vo_sub = NULL;
#endif
        vobsub_id = -1;
	if(dvdsub_lang) {
        dvdsub_id = -1;
        if (d_dvdsub) d_dvdsub->id = -1;
	}

        // be careful!

    }
#endif
            }
            if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps;
        } else { // off
            if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps;
#ifdef USE_SUB
            vo_osd_changed(OSDTYPE_SUBTITLE); 
#endif
	}

17732:4a8c4d03c88c

#endif
	} break;
    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)
            source = sub_source();

        set_of_sub_pos = -1;
        subdata = NULL;
        vo_sub_last = vo_sub = NULL;
#endif
        vobsub_id = -1;
	if(dvdsub_lang || reset) {
        dvdsub_id = -1;
        if (d_dvdsub) d_dvdsub->id = -1;
	}

        // be careful!

    }
#endif
            }
            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); 
#endif
	}