diff mplayer.c @ 1726:38871427a131

corrections to OSD progbar position calculations
author atlka
date Tue, 28 Aug 2001 12:43:41 +0000
parents bbd054c2cc20
children 9da2b587b029
line wrap: on
line diff
--- a/mplayer.c	Tue Aug 28 10:54:31 2001 +0000
+++ b/mplayer.c	Tue Aug 28 12:43:41 2001 +0000
@@ -1612,8 +1612,8 @@
         if(osd_level){
           osd_visible=sh_video->fps; // 1 sec
           vo_osd_progbar_type=OSD_VOLUME;
-          vo_osd_progbar_value=(mixer_l+mixer_r)*255/200;
-          //printf("volume: %d\n",vo_osd_progbar_value);
+          vo_osd_progbar_value=((mixer_l+mixer_r)*256.0)/200.0;
+          // printf("volume: %d\n",vo_osd_progbar_value);
         }
 #endif
       }
@@ -1649,7 +1649,7 @@
     		if(osd_level){
             	    osd_visible=sh_video->fps; // 1 sec
 	    	    vo_osd_progbar_type=OSD_CONTRAST;
-            	    vo_osd_progbar_value=(v_cont)*255/100;
+            	    vo_osd_progbar_value=((v_cont)<<8)/100;
 		}
 #endif
 	}
@@ -1668,7 +1668,7 @@
     		if(osd_level){
             	    osd_visible=sh_video->fps; // 1 sec
 	    	    vo_osd_progbar_type=OSD_BRIGHTNESS;
-            	    vo_osd_progbar_value=(v_bright)*255/100;
+            	    vo_osd_progbar_value=((v_bright)<<8)/100;
 		}
 #endif
 	}
@@ -1687,7 +1687,7 @@
     		if(osd_level){
             	    osd_visible=sh_video->fps; // 1 sec
 	    	    vo_osd_progbar_type=OSD_HUE;
-            	    vo_osd_progbar_value=(v_hue)*255/100;
+            	    vo_osd_progbar_value=((v_hue)<<8)/100;
 		}
 #endif
 	}
@@ -1706,7 +1706,7 @@
     		if(osd_level){
             	    osd_visible=sh_video->fps; // 1 sec
 	    	    vo_osd_progbar_type=OSD_SATURATION;
-            	    vo_osd_progbar_value=(v_saturation)*255/100;
+            	    vo_osd_progbar_value=((v_saturation)<<8)/100;
 		}
 #endif
 	}
@@ -1763,10 +1763,6 @@
           osd_visible=sh_video->fps; // 1 sec
           vo_osd_progbar_type=0;
 	  vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len;
-	  if (vo_osd_progbar_value<0)
-	     vo_osd_progbar_value=0;
-	  else if (vo_osd_progbar_value>255)
-	     vo_osd_progbar_value=255;
         }
       }
 #endif