diff options
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/mw.h | 13 | ||||
| -rw-r--r-- | Gui/mplayer/play.h | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index b32a416570..d24b8bd443 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -1,8 +1,6 @@ // main window -#include "mixer.h" - unsigned char * mplDrawBuffer = NULL; int mplMainRender = 1; int mplMainAutoPlay = 0; @@ -320,11 +318,10 @@ NoPause: 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 @@ void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY ) mplMainRender=1; SelectedButton=i; boxMoved=0; + if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1; msButton=itPotmeter; itemtype=itPotmeter; } @@ -452,6 +450,7 @@ void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY ) mplMainRender=1; SelectedButton=i; boxMoved=0; + if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1; msButton=itHPotmeter; itemtype=itHPotmeter; } diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h index 26477c9610..4547d7c77d 100644 --- a/Gui/mplayer/play.h +++ b/Gui/mplayer/play.h @@ -38,9 +38,13 @@ typedef struct mplUnknowErrorStruct error; int Playing; - float Volume; float Position; + + float Volume; + int VolumeChanged; float Balance; + int Mute; + int Track; int AudioType; int StreamType; |