[Mplayer-cvslog] CVS: main/libvo sub.c,1.69,1.70

[Arpi of Ize]

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

Modified Files:
	sub.c 
Log Message:
TiVo demuxer and sub-cc/osd decoder
patch by usenet at wingert.org
(http://tivo-mplayer.sourceforge.net/releases/MPlayer-20030501-tivo-patch.gz)
changes by me:
- spit demux_ty to demux_ty and demux_ty_osd (later handles mpeg user-data
  decoding, ie sub-cc and osd)
- removed some cosmetics changes
- some compile fixes (gcc3 specific variable decl etc)


Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sub.c	19 Jan 2003 20:13:49 -0000	1.69
+++ sub.c	9 Jun 2003 00:24:49 -0000	1.70
@@ -42,6 +42,7 @@
 int sub_visibility=1;
 int sub_bg_color=0; /* subtitles background color */
 int sub_bg_alpha=0;
+int sub_justify=0;
 
 // return the real height of a char:
 static inline int get_height(int c,int h){
@@ -449,6 +450,7 @@
     obj->bbox.y2 = obj->y + h;
 
     // calculate bbox:
+    if (sub_justify) xmin = 10;
     obj->bbox.x1=xmin;
     obj->bbox.x2=xmax;
     obj->bbox.y1=obj->y;
@@ -462,6 +464,7 @@
     i=j=0;
     if ((l=obj->params.subtitle.lines)) for (;;) {
  	 x=obj->params.subtitle.xtbl[i++]; 
+	 if (sub_justify) x = 10;
 	 prevc = -1;
 	 while ((c=obj->params.subtitle.utbl[j++])){
 	       x += kerning(vo_font,prevc,c);