[Mplayer-cvslog] CVS: main/Gui interface.c,1.94,1.95

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

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


Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- interface.c	25 Jun 2004 16:49:52 -0000	1.94
+++ interface.c	26 Jun 2004 13:26:10 -0000	1.95
@@ -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 @@
         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 @@
         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;