comparison libvo/font_load.c @ 217:cb3b0d65dddd

Search font files in ~/.mplayer/font/ instead of current dir
author lgb
date Mon, 26 Mar 2001 20:28:09 +0000
parents 338b5664ea13
children bc5c75b7a401
comparison
equal deleted inserted replaced
216:338b5664ea13 217:cb3b0d65dddd
107 } 107 }
108 } 108 }
109 109
110 if(strcmp(section,"[files]")==0){ 110 if(strcmp(section,"[files]")==0){
111 if(pdb==2 && strcmp(p[0],"alpha")==0){ 111 if(pdb==2 && strcmp(p[0],"alpha")==0){
112 char *cp=get_path("font/"); 112 char *cp,*cp2;
113 char *cp2=malloc(strlen(cp)+strlen(p[1])+1); 113 if (!(cp=get_path("font/"))) return NULL;
114 if (!(cp2=malloc(strlen(cp)+strlen(p[1])+1))) {
115 free(cp);
116 return NULL;
117 }
114 sprintf(cp2,"%s%s",cp,p[1]); 118 sprintf(cp2,"%s%s",cp,p[1]);
115 if(!((desc->pic_a[fontdb]=load_raw(cp2)))){ 119 if(!((desc->pic_a[fontdb]=load_raw(cp2)))){
116 printf("Can't load font bitmap: %s\n",p[1]); 120 printf("Can't load font bitmap: %s\n",p[1]);
117 free(cp); 121 free(cp);
118 free(cp2); 122 free(cp2);
121 free(cp); 125 free(cp);
122 free(cp2); 126 free(cp2);
123 continue; 127 continue;
124 } 128 }
125 if(pdb==2 && strcmp(p[0],"bitmap")==0){ 129 if(pdb==2 && strcmp(p[0],"bitmap")==0){
126 char *cp=get_path("font/"); 130 char *cp,*cp2;
127 char *cp2=malloc(strlen(cp)+strlen(p[1])+1); 131 if (!(cp=get_path("font/"))) return NULL;
132 if (!(cp2=malloc(strlen(cp)+strlen(p[1])+1))) {
133 free(cp);
134 return NULL;
135 }
128 sprintf(cp2,"%s%s",cp,p[1]); 136 sprintf(cp2,"%s%s",cp,p[1]);
129 if(!((desc->pic_b[fontdb]=load_raw(cp2)))){ 137 if(!((desc->pic_b[fontdb]=load_raw(cp2)))){
130 printf("Can't load font bitmap: %s\n",p[1]); 138 printf("Can't load font bitmap: %s\n",p[1]);
131 free(cp); 139 free(cp);
132 free(cp2); 140 free(cp2);