Mercurial > mplayer.hg

diff Gui/interface.c @ 12691:0230544f52a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix GUI compilation, patch by Reimar Dffinger and Alexander Strasser.
author diego
date Sat, 26 Jun 2004 13:26:11 +0000
parents 9a495bdc3a1e
children eb0d3c1b6c6d
line wrap: on
line diff
--- a/Gui/interface.c	Sat Jun 26 13:24:01 2004 +0000
+++ b/Gui/interface.c	Sat Jun 26 13:26:11 2004 +0000
@@ -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;