[MPlayer-cvslog] r35639 - trunk/gui/ui/main.c

[ib]

Author: ib
Date: Sun Dec  9 15:49:11 2012
New Revision: 35639

Log:
Use FFMIN in evSetVolume.

Additionally, remove commented code line.

Modified:
   trunk/gui/ui/main.c

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Sun Dec  9 15:44:58 2012	(r35638)
+++ trunk/gui/ui/main.c	Sun Dec  9 15:49:11 2012	(r35639)
@@ -56,6 +56,7 @@
 #include "m_property.h"
 #include "mp_core.h"
 #include "mpcommon.h"
+#include "libavutil/common.h"
 
 #define GUI_REDRAW_WAIT 375
 
@@ -290,10 +291,7 @@ NoPause:
         {
 	 float l = guiInfo.Volume * ( ( 100.0 - guiInfo.Balance ) / 50.0 );
 	 float r = guiInfo.Volume * ( ( guiInfo.Balance ) / 50.0 );
-	 if ( l > guiInfo.Volume ) l=guiInfo.Volume;
-	 if ( r > guiInfo.Volume ) r=guiInfo.Volume;
-//	 printf( "!!! v: %.2f b: %.2f -> %.2f x %.2f\n",guiInfo.Volume,guiInfo.Balance,l,r );
-         mixer_setvolume( mixer,l,r );
+         mixer_setvolume( mixer,FFMIN(l,guiInfo.Volume),FFMIN(r,guiInfo.Volume) );
 	}
 	if ( osd_level )
 	 {