Mercurial > mplayer.hg
comparison mplayer.c @ 19485:d04ee0eb6a11
support for disabling/enabling bitmap font support from configure
| author | diego |
|---|---|
| date | Mon, 21 Aug 2006 23:19:11 +0000 |
| parents | bab82c53e433 |
| children | 10d8f2cae948 |
comparison
equal
deleted
inserted
replaced
| 19484:6eb79b2384f8 | 19485:d04ee0eb6a11 |
|---|---|
| 2838 #endif | 2838 #endif |
| 2839 #ifdef HAVE_FONTCONFIG | 2839 #ifdef HAVE_FONTCONFIG |
| 2840 if(!font_fontconfig) | 2840 if(!font_fontconfig) |
| 2841 { | 2841 { |
| 2842 #endif | 2842 #endif |
| 2843 #ifdef HAVE_BITMAP_FONT | |
| 2843 if(font_name){ | 2844 if(font_name){ |
| 2844 vo_font=read_font_desc(font_name,font_factor,verbose>1); | 2845 vo_font=read_font_desc(font_name,font_factor,verbose>1); |
| 2845 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); | 2846 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); |
| 2846 } else { | 2847 } else { |
| 2847 // try default: | 2848 // try default: |
| 2848 vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1); | 2849 vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1); |
| 2849 free(mem_ptr); // release the buffer created by get_path() | 2850 free(mem_ptr); // release the buffer created by get_path() |
| 2850 if(!vo_font) | 2851 if(!vo_font) |
| 2851 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); | 2852 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); |
| 2852 } | 2853 } |
| 2854 #endif | |
| 2853 #ifdef HAVE_FONTCONFIG | 2855 #ifdef HAVE_FONTCONFIG |
| 2854 } | 2856 } |
| 2855 #endif | 2857 #endif |
| 2856 #endif /* USE_OSD */ | 2858 #endif /* USE_OSD */ |
| 2857 vo_init_osd(); | 2859 vo_init_osd(); |