# HG changeset patch # User lgb # Date 985626987 0 # Node ID 338b5664ea13f48c7df66075376a219a61979f50 # Parent 09d565842a333972363b982bce3d82a8e1beca31 Search font files in ~/.mplayer/font/ instead of current dir diff -r 09d565842a33 -r 338b5664ea13 libvo/font_load.c --- a/libvo/font_load.c Sun Mar 25 20:38:14 2001 +0000 +++ b/libvo/font_load.c Mon Mar 26 17:16:27 2001 +0000 @@ -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 @@ 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