[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.22,1.23 play.h,1.9,1.10

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv2822/Gui/mplayer

Modified Files:
	mw.h play.h 
Log Message:
add voluechanged

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mw.h	2 Sep 2001 19:38:37 -0000	1.22
+++ mw.h	2 Sep 2001 21:26:51 -0000	1.23
@@ -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;
                       }

Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- play.h	1 Sep 2001 17:53:07 -0000	1.9
+++ play.h	2 Sep 2001 21:26:51 -0000	1.10
@@ -38,9 +38,13 @@
    mplUnknowErrorStruct error;
 
    int    Playing;
-   float  Volume;
    float  Position;
+
+   float  Volume;
+   int    VolumeChanged;
    float  Balance;
+   int    Mute;
+   
    int    Track;
    int    AudioType;
    int    StreamType;