comparison mplayer.c @ 13126:b59e16a8dfc7

Support for subtitle switching in Matroska.

13125:69f13a4cbab9

/* display clip info */
demux_info_print(demuxer);

//================== Read SUBTITLES (DVD & TEXT) ==========================
if(vo_spudec==NULL && sh_video && stream->type==STREAMTYPE_DVD){

if (spudec_ifo) {
  unsigned int palette[16], width, height;
  current_module="spudec_init_vobsub";
  if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)

	    new_id = -1;
	if (new_id != dvdsub_id)
	    osd_show_vobsub_changed = sh_video->fps;
	dvdsub_id = new_id;
	d_dvdsub->id = demux_ogg_sub_id(new_id);
    }
#endif
        break;
    case MP_CMD_SUB_FORCED_ONLY:
      if (vo_spudec) {

13126:b59e16a8dfc7

/* display clip info */
demux_info_print(demuxer);

//================== Read SUBTITLES (DVD & TEXT) ==========================
if(vo_spudec==NULL && sh_video && (stream->type==STREAMTYPE_DVD || demuxer->type==DEMUXER_TYPE_MATROSKA)){

if (spudec_ifo) {
  unsigned int palette[16], width, height;
  current_module="spudec_init_vobsub";
  if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)

	    new_id = -1;
	if (new_id != dvdsub_id)
	    osd_show_vobsub_changed = sh_video->fps;
	dvdsub_id = new_id;
	d_dvdsub->id = demux_ogg_sub_id(new_id);
    }
#endif
#ifdef HAVE_MATROSKA
    if (d_dvdsub && demuxer->type == DEMUXER_TYPE_MATROSKA) {
      int new_id = dvdsub_id + 1;
      if (dvdsub_id < 0)
        new_id = 0;
      if ((unsigned int) new_id >= demux_mkv_num_subs(demuxer))
        new_id = -1;
      if (new_id != dvdsub_id)
        osd_show_vobsub_changed = sh_video->fps;
      dvdsub_id = new_id;
      d_dvdsub->id = demux_mkv_change_subs(demuxer, new_id);
      if (d_dvdsub->id >= 0 && ((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v') {
        mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh;
        if (vo_spudec != NULL)
          spudec_free(vo_spudec);
        vo_spudec =
          spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors,
                                   mkv_sh_sub->custom_colors,
                                   mkv_sh_sub->width,
                                   mkv_sh_sub->height);
        if (!forced_subs_only)
          forced_subs_only = mkv_sh_sub->forced_subs_only;
        if (vo_spudec) {
          spudec_set_forced_subs_only(vo_spudec, forced_subs_only);
          inited_flags |= INITED_SPUDEC;
        }
      }
    }
#endif
        break;
    case MP_CMD_SUB_FORCED_ONLY:
      if (vo_spudec) {