From faa08119a60fd9bdb8a1ac898af366ba88321bf8 Mon Sep 17 00:00:00 2001
From: pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 2 Sep 2001 21:26:51 +0000
Subject: add voluechanged

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1848 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Gui/mplayer/mw.h   | 13 ++++++-------
 Gui/mplayer/play.h |  6 +++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'Gui')

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;
-- 
cgit v1.2.3