[Mplayer-cvslog] CVS: main/libvo sub.c,1.58,1.59

[Jindrich Makovicka CVS]

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

Modified Files:
	sub.c 
Log Message:
progbar osd buffer height adjustment fix

Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sub.c	5 Dec 2002 00:03:35 -0000	1.58
+++ sub.c	10 Dec 2002 23:10:24 -0000	1.59
@@ -185,14 +185,15 @@
         int elems=width/charw;
    	int x=(dxs-elems*charw-delimw)/2;
 	int delta = 0;
-	if (vo_osd_progbar_type>0 && vo_font->font[vo_osd_progbar_type]>=0){
-	    delta = vo_font->width[vo_osd_progbar_type]+vo_font->spacewidth;
-	    delta = (x-delta > 0) ? delta : x;
-	}
 	h=get_height(OSD_PB_START,h);
 	h=get_height(OSD_PB_END,h);
 	h=get_height(OSD_PB_0,h);
 	h=get_height(OSD_PB_1,h);
+	if (vo_osd_progbar_type>0 && vo_font->font[vo_osd_progbar_type]>=0){
+	    delta = vo_font->width[vo_osd_progbar_type]+vo_font->spacewidth;
+	    delta = (x-delta > 0) ? delta : x;
+	    h=get_height(vo_osd_progbar_type,h);
+	}
 	obj->bbox.x1=obj->x=x;
 	obj->bbox.y1=obj->y=y;
 	obj->bbox.x2=x+width+delimw;