[Mplayer-cvslog] CVS: main/libvo sub.c,1.62,1.63 sub.h,1.23,1.24

[Arpi of Ize]

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

Modified Files:
	sub.c sub.h 
Log Message:
-subwidth


Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sub.c	27 Dec 2002 17:28:35 -0000	1.62
+++ sub.c	27 Dec 2002 21:41:40 -0000	1.63
@@ -37,6 +37,7 @@
 int sub_unicode=0;
 int sub_utf8=0;
 int sub_pos=100;
+int sub_width_p=100;
 int sub_alignment=0; /* 0=top, 1=center, 2=bottom */
 int sub_visibility=1;
 
@@ -374,7 +375,7 @@
 	      }
 	      obj->params.subtitle.utbl[k++]=c;
 	      xsize+=vo_font->width[c]+vo_font->charspace+kerning(vo_font,prevc,c);
-	      if (dxs<xsize){
+	      if (dxs*sub_width_p/100<xsize){
 		  prevc = -1;
 		 if (lastStripPosition>0){
 		    j=lastStripPosition;

Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sub.h	23 Dec 2002 01:37:43 -0000	1.23
+++ sub.h	27 Dec 2002 21:41:40 -0000	1.24
@@ -97,6 +97,7 @@
 extern char *sub_cp;
 #endif
 extern int sub_pos;
+extern int sub_width_p;
 extern int sub_alignment;
 extern int sub_visibility;
 extern int suboverlap_enabled;