[MPlayer-cvslog] r19491 - in trunk: configure libvo/Makefile mplayer.c

[Diego Biurrun]

On Tue, Aug 22, 2006 at 01:19:11AM +0200, diego wrote:
> 
> Modified:
>    trunk/configure
>    trunk/libvo/Makefile
>    trunk/mplayer.c
> 
> Log:
> support for disabling/enabling bitmap font support from configure
> 
> --- trunk/mplayer.c	(original)
> +++ trunk/mplayer.c	Tue Aug 22 01:19:11 2006
> @@ -2840,6 +2840,7 @@
>    if(!font_fontconfig)
>    {
>  #endif
> +#ifdef HAVE_BITMAP_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);
> @@ -2850,6 +2851,7 @@
>         if(!vo_font)
>         vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
>    }
> +#endif
>  #ifdef HAVE_FONTCONFIG
>    }
>  #endif

This was almost too easy.

Did I overlook some parts in the code that are related to bitmap fonts?
Are some options bitmap font only?

Diego