diff options
author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-21 00:14:49 +0000 |
---|---|---|
committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-21 00:14:49 +0000 |
commit | 6b28893d548d72c7871fa4236c8222687685a362 (patch) | |
tree | fa1fd273c28414c64fb48d48b4d9d03b0e6afa27 /mplayer.c | |
parent | 357832494ce8a034200eb15f4781bd1c54cd1223 (diff) | |
download | mpv-6b28893d548d72c7871fa4236c8222687685a362.tar.bz2 mpv-6b28893d548d72c7871fa4236c8222687685a362.tar.xz |
OSD progress bar for volume
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@556 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 27 |
1 files changed, 21 insertions, 6 deletions
@@ -1593,8 +1593,8 @@ switch(sh_video->codec->driver){ if(eof) break; if(force_redraw){ --force_redraw; - if(!force_redraw) osd_function=OSD_PLAY; } + if(!force_redraw) osd_function=OSD_PLAY; // printf("A:%6.1f V:%6.1f A-V:%7.3f frame=%5.2f \r",d_audio->pts,d_video->pts,d_audio->pts-d_video->pts,a_frame); // fflush(stdout); @@ -1733,11 +1733,26 @@ switch(sh_video->codec->driver){ osd_level=(osd_level+1)%3; break; case '*': - mixer_incvolume(); - break; - case '/': - mixer_decvolume(); - break; + case '/': { + int mixer_l=0; int mixer_r=0; + mixer_getvolume( &mixer_l,&mixer_r ); + if(c=='*'){ + if ( mixer_l < 100 ) mixer_l++; + if ( mixer_r < 100 ) mixer_r++; + } else { + if ( mixer_l > 0 ) mixer_l--; + if ( mixer_r > 0 ) mixer_r--; + } + mixer_setvolume( mixer_l,mixer_r ); + + if(osd_level){ + osd_visible=sh_video->fps; // 1 sec + vo_osd_progbar_type=OSD_VOLUME; + vo_osd_progbar_value=(mixer_l+mixer_r)*5/4; + //printf("volume: %d\n",vo_osd_progbar_value); + } + } + break; case 'm': mixer_usemaster=!mixer_usemaster; break; |