summaryrefslogtreecommitdiffstats
path: root/libmenu
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-07 10:36:07 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-07 10:36:07 +0000
commit091d352d065442817aa05c2f61910366004405be (patch)
tree9f9101aac327a41f88a3828a19cf6f2e5f4d4fc9 /libmenu
parentdba246199c20857d29a08bf176003b58736da31c (diff)
downloadmpv-091d352d065442817aa05c2f61910366004405be.tar.bz2
mpv-091d352d065442817aa05c2f61910366004405be.tar.xz
Rename font-related preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu')
-rw-r--r--libmenu/menu.c8
-rw-r--r--libmenu/vf_menu.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/libmenu/menu.c b/libmenu/menu.c
index 39e3b83675..41f33801fc 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -215,7 +215,7 @@ int menu_init(struct MPContext *mpctx, char* cfg_file) {
char* buffer = NULL;
int bl = BUF_STEP, br = 0;
int f, fd;
-#ifndef HAVE_FREETYPE
+#ifndef CONFIG_FREETYPE
if(vo_font == NULL)
return 0;
#endif
@@ -403,7 +403,7 @@ static void render_txt(char *txt)
}
}
-#ifdef HAVE_FRIBIDI
+#ifdef CONFIG_FRIBIDI
#include <fribidi/fribidi.h>
#include "libavutil/common.h"
char *menu_fribidi_charset = NULL;
@@ -459,7 +459,7 @@ void menu_draw_text(mp_image_t* mpi,char* txt, int x, int y) {
return;
}
-#ifdef HAVE_FRIBIDI
+#ifdef CONFIG_FRIBIDI
txt = menu_fribidi(txt);
#endif
render_txt(txt);
@@ -493,7 +493,7 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt,
return;
}
-#ifdef HAVE_FRIBIDI
+#ifdef CONFIG_FRIBIDI
txt = menu_fribidi(txt);
#endif
render_txt(txt);
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index a3437e194a..d0f8ef0a67 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -202,7 +202,7 @@ static void uninit(vf_instance_t *vf) {
static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt) {
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
// here is the right place to get screen dimensions
if (force_load_font) {
force_load_font = 0;