Fix GUI compilation, patch by Reimar Döffinger and Alexander Strasser.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12692 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 14 insertions, 7 deletions

diff --git a/Gui/interface.c b/Gui/interface.c
index 52c0ab3168..07363e882c 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -42,6 +42,8 @@
 #include "../m_config.h"
 #include "../m_option.h"
 
+extern mixer_t mixer; // mixer from mplayer.c
+
 guiInterface_t guiIntfStruct;
 int guiWinID=-1;
 
@@ -622,7 +624,7 @@ int guiGetEvent( int type,char * arg )
         if ( audio_out )
 	{
 	 float l,r;
-	 mixer_getvolume( &l,&r );
+	 mixer_getvolume( &mixer,&l,&r );
 	 guiIntfStruct.Volume=(r>l?r:l);
 	 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f;
 	   else guiIntfStruct.Balance=50.0f;
@@ -651,7 +653,7 @@ int guiGetEvent( int type,char * arg )
         if ( audio_out )
 	{
 	 float l,r;
-	 mixer_getvolume( &l,&r );
+	 mixer_getvolume( &mixer,&l,&r );
 	 guiIntfStruct.Volume=(r>l?r:l);
 	 if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f;
 	   else guiIntfStruct.Balance=50.0f;
diff --git a/Gui/mplayer/common.c b/Gui/mplayer/common.c
index 72f640d788..6ea890f5c3 100644
--- a/Gui/mplayer/common.c
+++ b/Gui/mplayer/common.c
@@ -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 @@ calclengthmmmmss:
        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;
diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c
index d03a63b47b..9f5433665d 100644
--- a/Gui/mplayer/gtk/menu.c
+++ b/Gui/mplayer/gtk/menu.c
@@ -17,6 +17,8 @@
 #include "../../../libmpdemux/stream.h"
 #include "../../../libmpdemux/demuxer.h"
 
+extern mixer_t mixer; // mixer from mplayer.c
+
 void ActivateMenuItem( int Item )
 {
 // fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 );
@@ -462,7 +464,7 @@ GtkWidget * create_PopUpMenu( void )
    }
 
   AddSeparator( Menu );
-  MenuItem=AddMenuCheckItem( Menu,MSGTR_MENU_Mute,muted,evMute );
+  MenuItem=AddMenuCheckItem( Menu,MSGTR_MENU_Mute,mixer.muted,evMute );
   if ( !guiIntfStruct.AudioType ) gtk_widget_set_sensitive( MenuItem,FALSE );
   AddMenuItem( Menu,MSGTR_MENU_PlayList, evPlayList );
   AddMenuItem( Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser );
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index 0e5ee5dce4..588915ea77 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -171,7 +171,6 @@ static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,g
 static void prEntry( GtkContainer * container,gpointer user_data );
 #endif
 
-extern int    muted;
 extern int    stop_xscreensaver;
 
 void ShowPreferences( void )
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index b1fec53154..f9b97a1386 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -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 @@ NoPause:
 
    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 @@ set_volume:
 	 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 )