summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoratlka <atlka@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-28 12:43:41 +0000
committeratlka <atlka@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-28 12:43:41 +0000
commit60737e38456d9a118272c47b517616c001f6b1b8 (patch)
treedd81684ce0ff5e653a9f79360970bc30b9307fff /mplayer.c
parent92828938a340c26b4fd5a568439ad700a1f09835 (diff)
downloadmpv-60737e38456d9a118272c47b517616c001f6b1b8.tar.bz2
mpv-60737e38456d9a118272c47b517616c001f6b1b8.tar.xz
corrections to OSD progbar position calculations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1727 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/mplayer.c b/mplayer.c
index 53f1aa6c83..8f175e97ac 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1612,8 +1612,8 @@ if(auto_quality>0){
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(auto_quality>0){
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(auto_quality>0){
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(auto_quality>0){
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(auto_quality>0){
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 @@ if(rel_seek_secs || abs_seek_pos){
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