mirror of https://github.com/mpv-player/mpv
OSD progress bar for volume
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@556 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
357832494c
commit
6b28893d54
25
mplayer.c
25
mplayer.c
|
@ -1593,8 +1593,8 @@ switch(sh_video->codec->driver){
|
||||||
if(eof) break;
|
if(eof) break;
|
||||||
if(force_redraw){
|
if(force_redraw){
|
||||||
--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);
|
// 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);
|
// fflush(stdout);
|
||||||
|
@ -1733,10 +1733,25 @@ switch(sh_video->codec->driver){
|
||||||
osd_level=(osd_level+1)%3;
|
osd_level=(osd_level+1)%3;
|
||||||
break;
|
break;
|
||||||
case '*':
|
case '*':
|
||||||
mixer_incvolume();
|
case '/': {
|
||||||
break;
|
int mixer_l=0; int mixer_r=0;
|
||||||
case '/':
|
mixer_getvolume( &mixer_l,&mixer_r );
|
||||||
mixer_decvolume();
|
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;
|
break;
|
||||||
case 'm':
|
case 'm':
|
||||||
mixer_usemaster=!mixer_usemaster;
|
mixer_usemaster=!mixer_usemaster;
|
||||||
|
|
Loading…
Reference in New Issue