1 files changed, 21 insertions, 12 deletions
diff --git a/Gui/mplayer/mixer.c b/Gui/mplayer/mixer.c
index 0178f3dd29..2ea816977d 100644
--- a/Gui/mplayer/mixer.c
+++ b/Gui/mplayer/mixer.c
@@ -1,29 +1,35 @@
 
 #include "play.h"
+#include "../../mixer.h"
+
+//extern void mixer_getvolume( float *l,float *r );
+//extern void mixer_setvolume( float l,float r );
+//extern void mixer_incvolume( void );
+//extern void mixer_decvolume( void );
+//extern float mixer_getbothvolume( void );
 
 float mixerGetVolume( void )
 {
-// ---
-// ---
+ mplShMem->Volume=mixer_getbothvolume();
  return mplShMem->Volume;
 }
 
-void mixerSetVolume( float v )
-{ // 0.0 ... 100.0
-// ---
-printf("%%%%%% mixerSetVolume(%5.3f)  \n",v);
-// ---
+void  mixerSetVolume( float v )
+{
  mplShMem->Volume=v;
+ mixer_setvolume( v,v );
 }
 
 void mixerIncVolume( void )
 {
- mixerSetVolume(  mixerGetVolume() + 1.0f );
+ mixer_incvolume();
+ mixerGetVolume();
 }
 
 void mixerDecVolume( void )
 {
- mixerSetVolume(  mixerGetVolume() - 1.0f );
+ mixer_decvolume();
+ mixerGetVolume();
 }
 
 void mixerMute( void )
@@ -32,8 +38,11 @@ void mixerMute( void )
 
 void mixerSetBalance( float b )
 {
-// ---
-// ---
-printf("%%%%%% mixerSetBalance(%5.3f)  \n",b);
+//printf("%%%%%% mixerSetBalance(%5.3f)  \n",b);
  mplShMem->Balance=b;
 }
+
+float mixerGetBalance( void )
+{
+ return mplShMem->Balance;
+}