summaryrefslogtreecommitdiffstats
path: root/Gui/interface.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-26 13:26:11 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-26 13:26:11 +0000
commit662419c0f86e774be1ca0c42adb7a572d68918a3 (patch)
treec6c67868a519fc8a2008755bdca631048398ccc2 /Gui/interface.c
parentb3b303c6c2460b12a200316a99fa748c16cbdbd0 (diff)
downloadmpv-662419c0f86e774be1ca0c42adb7a572d68918a3.tar.bz2
mpv-662419c0f86e774be1ca0c42adb7a572d68918a3.tar.xz
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
Diffstat (limited to 'Gui/interface.c')
-rw-r--r--Gui/interface.c6
1 files changed, 4 insertions, 2 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;