From 5919d4a501068067492a02120b51970618ba3c1e Mon Sep 17 00:00:00 2001 From: lgb Date: Mon, 26 Mar 2001 17:16:27 +0000 Subject: Search font files in ~/.mplayer/font/ instead of current dir git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@217 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/font_load.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'libvo') diff --git a/libvo/font_load.c b/libvo/font_load.c index 9c5f521a72..4081240ac2 100644 --- a/libvo/font_load.c +++ b/libvo/font_load.c @@ -5,6 +5,8 @@ #include "font_load.h" +char *get_path ( char * ); + raw_file* load_raw(char *name){ int bpp; raw_file* raw=malloc(sizeof(raw_file)); @@ -107,17 +109,31 @@ while(fgets(sor,1020,f)){ if(strcmp(section,"[files]")==0){ if(pdb==2 && strcmp(p[0],"alpha")==0){ - if(!((desc->pic_a[fontdb]=load_raw(p[1])))){ + char *cp=get_path("font/"); + char *cp2=malloc(strlen(cp)+strlen(p[1])+1); + sprintf(cp2,"%s%s",cp,p[1]); + if(!((desc->pic_a[fontdb]=load_raw(cp2)))){ printf("Can't load font bitmap: %s\n",p[1]); + free(cp); + free(cp2); return NULL; } + free(cp); + free(cp2); continue; } if(pdb==2 && strcmp(p[0],"bitmap")==0){ - if(!((desc->pic_b[fontdb]=load_raw(p[1])))){ + char *cp=get_path("font/"); + char *cp2=malloc(strlen(cp)+strlen(p[1])+1); + sprintf(cp2,"%s%s",cp,p[1]); + if(!((desc->pic_b[fontdb]=load_raw(cp2)))){ printf("Can't load font bitmap: %s\n",p[1]); + free(cp); + free(cp2); return NULL; } + free(cp); + free(cp2); continue; } } else -- cgit v1.2.3