summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-14 14:13:53 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-14 14:13:53 +0000
commit99a8a0d1b429b1fdcfd8a073ac273710d40209bc (patch)
treed8a8726aea3ea1b1f330ebb4d31a18c2be7ec091 /libvo
parent70b43a41778e138a7f072bb455ec51a375a726db (diff)
downloadmpv-99a8a0d1b429b1fdcfd8a073ac273710d40209bc.tar.bz2
mpv-99a8a0d1b429b1fdcfd8a073ac273710d40209bc.tar.xz
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
Diffstat (limited to 'libvo')
-rw-r--r--libvo/font_load.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/libvo/font_load.c b/libvo/font_load.c
index 9f0204b5c7..7faca4b884 100644
--- a/libvo/font_load.c
+++ b/libvo/font_load.c
@@ -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]);