comparison mplayer.c @ 32642:7b135236a44a

Factorize subtitles loading between mplayer and mencoder.

32641:a2822f8f5e6d

// after reading video params we should load subtitles because
// we know fps so now we can adjust subtitle time to ~6 seconds AST
// check .sub
  double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25;
  current_module="read_subtitles_file";
  if(sub_name){
    for (i = 0; sub_name[i] != NULL; ++i)
        add_subtitles (sub_name[i], fps, 0);
  }
  if(sub_auto) { // auto load sub file ...
    char *psub = get_path( "sub/" );
    char **tmp = sub_filenames((psub ? psub : ""), filename);
    int i = 0;
    free(psub); // release the buffer created by get_path() above
    while (tmp[i]) {
        add_subtitles (tmp[i], fps, 1);
        free(tmp[i++]);
    }
    free(tmp);
  }
  if (mpctx->set_of_sub_size > 0)
      mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size;
}

if (select_subtitle(mpctx)) {

32642:7b135236a44a

// after reading video params we should load subtitles because
// we know fps so now we can adjust subtitle time to ~6 seconds AST
// check .sub
  double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25;
  current_module="read_subtitles_file";
  load_subtitles(filename, fps, add_subtitles);
  if (mpctx->set_of_sub_size > 0)
      mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size;
}

if (select_subtitle(mpctx)) {