[Mplayer-cvslog] CVS: main/TOOLS/subfont-c fontgen,1.1,1.2 runme,1.4,1.5 subfont.c,1.12,1.13

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/TOOLS/subfont-c
In directory mail:/var/tmp.root/cvs-serv6431

Modified Files:
	fontgen runme subfont.c 
Log Message:
smth

Index: fontgen
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/subfont-c/fontgen,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontgen	3 Mar 2002 19:17:22 -0000	1.1
+++ fontgen	25 Jul 2002 13:36:59 -0000	1.2
@@ -32,7 +32,7 @@
 
 if [ ! -x $subfont_exec ]; then
     echo "fontgen: 'subfont' not found or not executable!"
-    echo "fontgen: trying to make sources"
+    echo "fontgen: trying to compile"
     
     make || exit
     

Index: runme
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/subfont-c/runme,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- runme	24 Aug 2001 08:55:00 -0000	1.4
+++ runme	25 Jul 2002 13:36:59 -0000	1.5
@@ -1,11 +1,14 @@
 #!/bin/bash
 
 #unicode="--unicode"
-font=arial.ttf
+#font=arial.ttf
+#font=mints-mild.pcf
+#font=/home/alex/artwiz-mints-mild-latin2.hex
+font=$1
 #font=verdana.ttf
 encoding=iso-8859-2
-fontsize=24
-symbolssize=35
+fontsize=$2
+symbolssize=$3
 blur=2
 outline=1.5
 

Index: subfont.c
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/subfont-c/subfont.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- subfont.c	2 May 2002 01:56:28 -0000	1.12
+++ subfont.c	25 Jul 2002 13:36:59 -0000	1.13
@@ -260,7 +260,7 @@
     fprintf(f, "name 'Subtitle font for %s %s, \"%s%s%s\" face, size: %.1f pixels.'\n",
 	    encoding_name,
 	    unicode_desc ? "charset, Unicode encoding":"encoding",
-	    face->family_name,
+	    face->family_name ? face->family_name : font_path,
 	    face->style_name ? " ":"", face->style_name ? face->style_name:"",
 	    ppem);