Mercurial > mplayer.hg

comparison mencoder.c @ 11580:90953d955165

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
author alex
date Mon, 08 Dec 2003 12:14:32 +0000
parents b293b4eb2c8c
children 6ea42c885d60
comparison
equal deleted inserted replaced
11579:2f96ed23c71b 11580:90953d955165
173 #include "libvo/font_load.h" 173 #include "libvo/font_load.h"
174 #include "libvo/sub.h" 174 #include "libvo/sub.h"
175 175
176 // sub: 176 // sub:
177 char *font_name=NULL; 177 char *font_name=NULL;
178 #ifdef HAVE_FONTCONFIG
179 int font_fontconfig=0;
180 #endif
178 float font_factor=0.75; 181 float font_factor=0.75;
179 char **sub_name=NULL; 182 char **sub_name=NULL;
180 float sub_delay=0; 183 float sub_delay=0;
181 float sub_fps=0; 184 float sub_fps=0;
182 int sub_auto = 0; 185 int sub_auto = 0;
441 444
442 // check font 445 // check font
443 #ifdef USE_OSD 446 #ifdef USE_OSD
444 #ifdef HAVE_FREETYPE 447 #ifdef HAVE_FREETYPE
445 init_freetype(); 448 init_freetype();
446 #else 449 #endif
450 #ifdef HAVE_FONTCONFIG
451 if(!font_fontconfig)
452 {
453 #endif
447 if(font_name){ 454 if(font_name){
448 vo_font=read_font_desc(font_name,font_factor,verbose>1); 455 vo_font=read_font_desc(font_name,font_factor,verbose>1);
449 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); 456 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
450 } else { 457 } else {
451 // try default: 458 // try default:
452 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); 459 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
453 if(!vo_font) 460 if(!vo_font)
454 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); 461 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
462 }
463 #ifdef HAVE_FONTCONFIG
455 } 464 }
456 #endif 465 #endif
457 #endif 466 #endif
458 467
459 vo_init_osd(); 468 vo_init_osd();