From af743c2bd6b0752538d2995acb89c0012bfe5753 Mon Sep 17 00:00:00 2001 From: Thom Johansen Date: Fri, 23 Feb 2007 12:22:17 +0000 Subject: Remove unneeded zero checks from convert_gain() and get_replaygain_int(). These functions return correct results without them. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12459 a1c6a512-1295-4272-9138-f99709370657 --- firmware/replaygain.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/firmware/replaygain.c b/firmware/replaygain.c index b7cde7f005..c934586f4b 100644 --- a/firmware/replaygain.c +++ b/firmware/replaygain.c @@ -288,37 +288,27 @@ static long fp_atof(const char* s, int precision) static long convert_gain(long gain) { - if (gain != 0) + /* Don't allow unreasonably low or high gain changes. + * Our math code can't handle it properly anyway. :) + */ + if (gain < (-48 * FP_ONE)) { - /* Don't allow unreasonably low or high gain changes. - * Our math code can't handle it properly anyway. :) - */ - if (gain < (-48 * FP_ONE)) - { - gain = -48 * FP_ONE; - } - - if (gain > (17 * FP_ONE)) - { - gain = 17 * FP_ONE; - } + gain = -48 * FP_ONE; + } - gain = fp_exp10(gain / 20) << (24 - FP_BITS); + if (gain > (17 * FP_ONE)) + { + gain = 17 * FP_ONE; } + gain = fp_exp10(gain / 20) << (24 - FP_BITS); + return gain; } long get_replaygain_int(long int_gain) { - long gain = 0; - - if (int_gain) - { - gain = convert_gain(int_gain * FP_ONE / 100); - } - - return gain; + return convert_gain(int_gain * FP_ONE / 100); } long get_replaygain(const char* str) -- cgit v1.2.3