comparison mplayer.c @ 8635:81dbd28ef7c0

these patches let ,,oldstyle'' and freetype subtitle renderers live together happily. if an oldstyle subtitle (font.desc) is found, it will be used. otherwise mplayer will choose subfont.ttf, if freetype was detected during ./configure. (also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too) patch-set by Wojtek Kaniewski <[e-mail]>

8634:a8c4246b6869

    mp_msg_set_level(verbose+MSGL_STATUS);

//------ load global data first ------

#ifdef USE_OSD
#ifndef HAVE_FREETYPE
// check font
  if(font_name){
       vo_font=read_font_desc(font_name,font_factor,verbose>1);
       if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
  } else {
      // try default:
       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
       if(!vo_font)
       vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
  }
#else
  init_freetype();
#endif
#endif
  vo_init_osd();

#ifdef HAVE_RTC

8635:81dbd28ef7c0

    mp_msg_set_level(verbose+MSGL_STATUS);

//------ load global data first ------

#ifdef USE_OSD
// check font
  if(font_name){
       vo_font=read_font_desc(font_name,font_factor,verbose>1);
       if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
  } else {
      // try default:
       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
       if(!vo_font)
       vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
  }
#ifdef HAVE_FREETYPE
  if (!vo_font)
	init_freetype();
#endif
#endif
  vo_init_osd();

#ifdef HAVE_RTC