# HG changeset patch # User ib # Date 1394629012 0 # Node ID 6f52d357f7a519df7f922129d32074c603c5ed26 # Parent 97a16ac7f8dd7d5c2c06bf7a81c8fceea3209db7 Remove pointless parentheses. diff -r 97a16ac7f8dd -r 6f52d357f7a5 gui/ui/actions.c --- a/gui/ui/actions.c Wed Mar 12 12:07:51 2014 +0000 +++ b/gui/ui/actions.c Wed Mar 12 12:56:52 2014 +0000 @@ -324,15 +324,15 @@ 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 @@ 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); } diff -r 97a16ac7f8dd -r 6f52d357f7a5 gui/win32/interface.c --- a/gui/win32/interface.c Wed Mar 12 12:07:51 2014 +0000 +++ b/gui/win32/interface.c Wed Mar 12 12:56:52 2014 +0000 @@ -323,8 +323,8 @@ 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;