[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk menu.c, 1.30, 1.31 opts.c, 1.62, 1.63

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

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


Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- menu.c	8 Jan 2004 18:29:27 -0000	1.30
+++ menu.c	26 Jun 2004 13:26:11 -0000	1.31
@@ -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 @@
    }
 
   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 );

Index: opts.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- opts.c	3 Feb 2004 19:02:45 -0000	1.62
+++ opts.c	26 Jun 2004 13:26:11 -0000	1.63
@@ -171,7 +171,6 @@
 static void prEntry( GtkContainer * container,gpointer user_data );
 #endif
 
-extern int    muted;
 extern int    stop_xscreensaver;
 
 void ShowPreferences( void )