# HG changeset patch # User pontscho # Date 999466011 0 # Node ID 773ae4ba43f5b719a16d676e99cf6a2b6ab1657f # Parent caa5d43dcde5f31d0d33b16397d71c343f3be014 add voluechanged diff -r caa5d43dcde5 -r 773ae4ba43f5 Gui/mplayer/mw.h --- a/Gui/mplayer/mw.h Sun Sep 02 20:33:25 2001 +0000 +++ b/Gui/mplayer/mw.h Sun Sep 02 21:26:51 2001 +0000 @@ -1,8 +1,6 @@ // main window -#include "mixer.h" - unsigned char * mplDrawBuffer = NULL; int mplMainRender = 1; int mplMainAutoPlay = 0; @@ -320,11 +318,10 @@ case evBackward10sec: mplRelSeek( -10 ); break; case evSetMoviePosition: mplAbsSeek( param ); break; - case evIncVolume: mixerIncVolume(); break; - case evDecVolume: mixerDecVolume(); break; - case evSetVolume: mixerSetVolume( param ); break; - case evSetBalance: mixerSetBalance( param ); break; - case evMute: mixerMute(); break; + case evMute: mplShMem->Mute=1; break; + case evSetVolume: + case evSetBalance: mplShMem->VolumeChanged=1; break; + case evNormalSize: if ( mplShMem->Playing ) @@ -438,6 +435,7 @@ mplMainRender=1; SelectedButton=i; boxMoved=0; + if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1; msButton=itPotmeter; itemtype=itPotmeter; } @@ -452,6 +450,7 @@ mplMainRender=1; SelectedButton=i; boxMoved=0; + if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1; msButton=itHPotmeter; itemtype=itHPotmeter; } diff -r caa5d43dcde5 -r 773ae4ba43f5 Gui/mplayer/play.h --- a/Gui/mplayer/play.h Sun Sep 02 20:33:25 2001 +0000 +++ b/Gui/mplayer/play.h Sun Sep 02 21:26:51 2001 +0000 @@ -38,9 +38,13 @@ mplUnknowErrorStruct error; int Playing; + float Position; + float Volume; - float Position; + int VolumeChanged; float Balance; + int Mute; + int Track; int AudioType; int StreamType;