[MPlayer-cvslog] r36998 - in trunk/gui: ui/actions.c win32/interface.c
ib
subversion at mplayerhq.hu
Wed Mar 12 13:56:52 CET 2014
Author: ib
Date: Wed Mar 12 13:56:52 2014
New Revision: 36998
Log:
Remove pointless parentheses.
Modified:
trunk/gui/ui/actions.c
trunk/gui/win32/interface.c
Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c Wed Mar 12 13:07:51 2014 (r36997)
+++ trunk/gui/ui/actions.c Wed Mar 12 13:56:52 2014 (r36998)
@@ -324,15 +324,15 @@ play:
case evSetVolume:
guiInfo.Volume = param;
{
- float l = guiInfo.Volume * ((100.0 - guiInfo.Balance) / 50.0);
- float r = guiInfo.Volume * ((guiInfo.Balance) / 50.0);
+ float l = guiInfo.Volume * (100.0 - guiInfo.Balance) / 50.0;
+ float r = guiInfo.Volume * guiInfo.Balance / 50.0;
mixer_setvolume(mixer, FFMIN(l, guiInfo.Volume), FFMIN(r, guiInfo.Volume));
}
if (osd_level) {
osd_visible = (GetTimerMS() + 1000) | 1;
vo_osd_progbar_type = OSD_VOLUME;
- vo_osd_progbar_value = ((guiInfo.Volume) * 256.0) / 100.0;
+ vo_osd_progbar_value = guiInfo.Volume * 256.0 / 100.0;
vo_osd_changed(OSDTYPE_PROGBAR);
}
@@ -349,7 +349,7 @@ play:
if (osd_level) {
osd_visible = (GetTimerMS() + 1000) | 1;
vo_osd_progbar_type = OSD_BALANCE;
- vo_osd_progbar_value = ((guiInfo.Balance) * 256.0) / 100.0;
+ vo_osd_progbar_value = guiInfo.Balance * 256.0 / 100.0;
vo_osd_changed(OSDTYPE_PROGBAR);
}
Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c Wed Mar 12 13:07:51 2014 (r36997)
+++ trunk/gui/win32/interface.c Wed Mar 12 13:56:52 2014 (r36998)
@@ -323,8 +323,8 @@ static void guiSetEvent(int event)
if (guiInfo.Balance == 50.0f)
mixer_setvolume(mixer, guiInfo.Volume, guiInfo.Volume);
- l = guiInfo.Volume * ((100.0f - guiInfo.Balance) / 50.0f);
- r = guiInfo.Volume * ((guiInfo.Balance) / 50.0f);
+ l = guiInfo.Volume * (100.0f - guiInfo.Balance) / 50.0f;
+ r = guiInfo.Volume * guiInfo.Balance / 50.0f;
if (l > guiInfo.Volume) l=guiInfo.Volume;
if (r > guiInfo.Volume) r=guiInfo.Volume;
More information about the MPlayer-cvslog
mailing list