[Mplayer-cvslog] CVS: main/libvo font_load.c,1.25,1.26 font_load_ft.c,1.9,1.10 vosub_vidix.c,1.57,1.58

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv3233/libvo

Modified Files:
	font_load.c font_load_ft.c vosub_vidix.c 
Log Message:
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR


Index: font_load.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- font_load.c	29 Dec 2002 14:59:23 -0000	1.25
+++ font_load.c	9 Jun 2003 12:15:47 -0000	1.26
@@ -157,7 +157,7 @@
   } else    
 
   if(strcmp(section,"[files]")==0){
-      char *default_dir=DATADIR"/font";
+      char *default_dir=MPLAYER_DATADIR "/font";
       if(pdb==2 && strcmp(p[0],"alpha")==0){
     	  char *cp;
 	  if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) return NULL;

Index: font_load_ft.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load_ft.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- font_load_ft.c	30 Jan 2003 19:58:43 -0000	1.9
+++ font_load_ft.c	9 Jun 2003 12:15:47 -0000	1.10
@@ -905,7 +905,7 @@
     if (err) {
 	err = FT_New_Face(library, get_path("subfont.ttf"), 0, face);
 	if (err) {
-	    err = FT_New_Face(library, DATADIR"/subfont.ttf", 0, face);
+	    err = FT_New_Face(library, MPLAYER_DATADIR "/subfont.ttf", 0, face);
 	    if (err) {
 	        mp_msg(MSGT_OSD, MSGL_ERR, "New_Face failed. Maybe the font path is wrong.\nPlease supply the text font file (~/.mplayer/subfont.ttf).\n" );
 		return -1;

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- vosub_vidix.c	15 Dec 2002 18:18:41 -0000	1.57
+++ vosub_vidix.c	9 Jun 2003 12:15:47 -0000	1.58
@@ -709,7 +709,7 @@
 	  printf("vosub_vidix: You have wrong version of VIDIX library\n");
 	  return -1;
 	}
-	vidix_handler = vdlOpen(LIBDIR"/mplayer/vidix/",
+	vidix_handler = vdlOpen(MPLAYER_LIBDIR "/mplayer/vidix/",
 				drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
 				TYPE_OUTPUT,
 				verbose);