Mercurial > mplayer.hg
diff mplayer.c @ 1852:58dd326fcc4a
fix xshape, mixer, fullscreen, etc
author | pontscho |
---|---|
date | Tue, 04 Sep 2001 15:21:00 +0000 |
parents | 8ce1c088d05d |
children | 52fc1dc76652 |
line wrap: on
line diff
--- a/mplayer.c Mon Sep 03 16:32:03 2001 +0000 +++ b/mplayer.c Tue Sep 04 15:21:00 2001 +0000 @@ -1594,9 +1594,6 @@ case '/': { float mixer_l, mixer_r; mixer_getvolume( &mixer_l,&mixer_r ); - #ifdef HAVE_NEW_GUI - if ( use_gui ) mplShMem->Volume=( mixer_l + mixer_r ) / 2; - #endif if(c=='*' || c=='0'){ if ( ++mixer_l > 100 ) mixer_l = 100; if ( ++mixer_r > 100 ) mixer_r = 100; @@ -1611,7 +1608,7 @@ 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; - // printf("volume: %d\n",vo_osd_progbar_value); + //printf("volume: %d\n",vo_osd_progbar_value); } #endif } @@ -1789,19 +1786,22 @@ mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f); } mplShMem->TimeSec=d_video->pts; -// printf("mplShMem->Playing=%d \n",mplShMem->Playing); if(mplShMem->Playing==0) break; // STOP if(mplShMem->Playing==2) osd_function=OSD_PAUSE; -#ifdef USE_OSD - if ( ( osd_level )&&( mplShMem->VolumeChanged ) ) + if ( mplShMem->VolumeChanged ) { - osd_visible=sh_video->fps; // 1 sec - vo_osd_progbar_type=OSD_VOLUME; - vo_osd_progbar_value=((mplShMem->Volume )*256.0)/100.0; - } + mixer_setvolume( mplShMem->Volume,mplShMem->Volume ); + mplShMem->VolumeChanged=0; +#ifdef USE_OSD + if ( osd_level ) + { + osd_visible=sh_video->fps; // 1 sec + vo_osd_progbar_type=OSD_VOLUME; + vo_osd_progbar_value=( ( mplShMem->Volume ) * 256.0 ) / 100.0; + } #endif - mixer_setvolume( mplShMem->Volume,mplShMem->Volume ); - mplShMem->VolumeChanged=0; + } + mplShMem->Volume=(float)mixer_getbothvolume(); } #endif @@ -1883,6 +1883,7 @@ wsPostRedisplay( &appMPlayer.subWindow ); mplShMem->TimeSec=0; mplShMem->Position=0; + mplShMem->FrameDrop=0; } #endif