[Mplayer-cvslog] CVS: main/Gui/mplayer common.c, 1.6, 1.7 mw.c, 1.110, 1.111

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var2/tmp/cvs-serv10651/Gui/mplayer

Modified Files:
	common.c mw.c 
Log Message:
Fix GUI compilation, patch by Reimar Döffinger and Alexander Strasser.


Index: common.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/common.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- common.c	26 Jun 2004 12:22:48 -0000	1.6
+++ common.c	26 Jun 2004 13:26:11 -0000	1.7
@@ -30,6 +30,8 @@
 #include "play.h"
 #include "widgets.h"
 
+extern mixer_t mixer; // mixer from mplayer.c
+
 extern unsigned int GetTimerMS( void );
 
 inline void TranslateFilename( int c,char * tmp,size_t tmplen )
@@ -143,7 +145,7 @@
        case 'l': if ( guiIntfStruct.Playing == 1 ) strlcat( trbuf,"p",sizeof( trbuf ) ); break;
        case 'e': if ( guiIntfStruct.Playing == 2 ) strlcat( trbuf,"e",sizeof( trbuf ) ); break;
        case 'a':
-            if ( muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; }
+            if ( mixer.muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; }
             switch ( guiIntfStruct.AudioType )
              {
               case 0: strlcat( trbuf,"n",sizeof( trbuf ) ); break;

Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mw.c	26 May 2003 08:45:42 -0000	1.110
+++ mw.c	26 Jun 2004 13:26:11 -0000	1.111
@@ -30,6 +30,8 @@
 #include "play.h"
 #include "widgets.h"
 
+extern mixer_t mixer; // mixer from mplayer.c
+
 extern unsigned int GetTimerMS( void );
 
 unsigned char * mplDrawBuffer = NULL;
@@ -242,7 +244,7 @@
 
    case evIncVolume:  vo_x11_putkey( wsGrayMul ); break;
    case evDecVolume:  vo_x11_putkey( wsGrayDiv ); break;
-   case evMute:       mixer_mute(); break;
+   case evMute:       mixer_mute( &mixer ); break;
 
    case evSetVolume:
         guiIntfStruct.Volume=param;
@@ -256,7 +258,7 @@
 	 if ( l > guiIntfStruct.Volume ) l=guiIntfStruct.Volume;
 	 if ( r > guiIntfStruct.Volume ) r=guiIntfStruct.Volume;
 //	 printf( "!!! v: %.2f b: %.2f -> %.2f x %.2f\n",guiIntfStruct.Volume,guiIntfStruct.Balance,l,r );
-         mixer_setvolume( l,r );
+         mixer_setvolume( &mixer,l,r );
 	}
 #ifdef USE_OSD
 	if ( osd_level )