[Mplayer-cvslog] CVS: main/libvo sub.c,1.26,1.27

[Adam Tla/lka]

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

Modified Files:
	sub.c 
Log Message:

changes according to OSD calculations


Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sub.c	28 Aug 2001 12:43:41 -0000	1.26
+++ sub.c	28 Aug 2001 14:22:37 -0000	1.27
@@ -34,8 +34,8 @@
 
 // if we have n=256 bars then OSD progbar looks like below
 // 
-// 0   1    2    3 ...   256  <= vo_osd_progbar_value
-// |   |    |    |       |
+// 0  1    2    3 ...  256  <= vo_osd_progbar_value
+// |  |    |    |       |
 // [ ===  ===  === ... === ]
 // 
 //  the above schema is rescalled to n=elems bars
@@ -56,12 +56,9 @@
 
 	if (vo_osd_progbar_value<=0)
      	   mark=0;
-	else {
-	   int mm=vo_osd_progbar_value*elems;
-	   mark=mm>>8;
-	   if (mm & 0x00FF) mark++;
-	   if (mark>elems) mark=elems;
-	}
+	else if ((mark=(vo_osd_progbar_value*elems)>>8)>elems)
+	   mark=elems;
+
 //        printf("osd.progbar  width=%d  xpos=%d\n",width,x);
 
         c=vo_osd_progbar_type;