Mercurial > mplayer.hg

changeset 1847:773ae4ba43f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add voluechanged
author pontscho
date Sun, 02 Sep 2001 21:26:51 +0000
parents caa5d43dcde5
children 8ce1c088d05d
files Gui/mplayer/mw.h Gui/mplayer/play.h
diffstat 2 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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;
                       }
--- 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;