summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/mplayer.c b/mplayer.c
index 00fcd475e0..9779011363 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1645,22 +1645,17 @@ if(auto_quality>0){
case '0':
case '*':
case '/': {
- float mixer_l, mixer_r;
- mixer_getvolume( &mixer_l,&mixer_r );
if(c=='*' || c=='0'){
- if ( ++mixer_l > 100 ) mixer_l = 100;
- if ( ++mixer_r > 100 ) mixer_r = 100;
+ mixer_incvolume();
} else {
- if ( --mixer_l < 0 ) mixer_l = 0;
- if ( --mixer_r < 0 ) mixer_r = 0;
+ mixer_decvolume();
}
- mixer_setvolume( mixer_l,mixer_r );
#ifdef USE_OSD
if(osd_level){
osd_visible=sh_video->fps; // 1 sec
vo_osd_progbar_type=OSD_VOLUME;
- vo_osd_progbar_value=((mixer_l+mixer_r)*256.0)/200.0;
+ vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0;
//printf("volume: %d\n",vo_osd_progbar_value);
}
#endif