RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Make path separator for font path a define and set it to a better value for AMIGAOS 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19392 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-08-14 14:13:53 +00:00
parent 70b43a4177
commit 99a8a0d1b4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libvo/font_load.c
View File

@ -160,19 +160,26 @@ while(fgets(sor,1020,f)){
}
} else
#ifdef SYS_AMIGAOS4
#define FONT_PATH_SEP ""
#else
//! path seperator for font paths, may not be more than one character
#define FONT_PATH_SEP "/"
#endif
if(strcmp(section,"[files]")==0){
char *default_dir=MPLAYER_DATADIR "/font";
char *default_dir=MPLAYER_DATADIR FONT_PATH_SEP "font";
if(pdb==2 && strcmp(p[0],"alpha")==0){
char *cp;
if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) goto fail_out;
snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s/%s",
snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
desc->fpath,p[1]);
if(!((desc->pic_a[fontdb]=load_raw(cp,verbose)))){
free(cp);
if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
goto fail_out;
snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s/%s",
snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
default_dir,p[1]);
if (!((desc->pic_a[fontdb]=load_raw(cp,verbose)))){
mp_msg(MSGT_OSD, MSGL_ERR, "Can't load font bitmap: %s\n",p[1]);
@ -187,13 +194,13 @@ while(fgets(sor,1020,f)){
char *cp;
if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) goto fail_out;
snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s/%s",
snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
desc->fpath,p[1]);
if(!((desc->pic_b[fontdb]=load_raw(cp,verbose)))){
free(cp);
if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
goto fail_out;
snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s/%s",
snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
default_dir,p[1]);
if (!((desc->pic_b[fontdb]=load_raw(cp,verbose)))){
mp_msg(MSGT_OSD, MSGL_ERR, "Can't load font bitmap: %s\n",p[1]);