diff options
author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 15:16:48 +0000 |
---|---|---|
committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 15:16:48 +0000 |
commit | f21f6ae82a790d6e0ad53bd7eef20842bd443218 (patch) | |
tree | 76635e989b9cee45e1c0376675b4149a86bfe53e /utils/muted.c | |
parent | 777979c9d9280bfd9526345a1b326ad46b1b45fb (diff) |
More merges from resolve-shadow warnings:
utils/
codecs/
and a change I missed from formats/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136408 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils/muted.c')
-rw-r--r-- | utils/muted.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/muted.c b/utils/muted.c index 4a4d4b7e9..f11ea4bac 100644 --- a/utils/muted.c +++ b/utils/muted.c @@ -410,19 +410,19 @@ static float mutevol = 0; #endif #ifndef __Darwin__ -static int mutedlevel(int orig, int mutelevel) +static int mutedlevel(int orig, int level) { int l = orig >> 8; int r = orig & 0xff; - l = (float)(mutelevel) * (float)(l) / 100.0; - r = (float)(mutelevel) * (float)(r) / 100.0; + l = (float)(level) * (float)(l) / 100.0; + r = (float)(level) * (float)(r) / 100.0; return (l << 8) | r; #else -static float mutedlevel(float orig, float mutelevel) +static float mutedlevel(float orig, float level) { float master = orig; - master = mutelevel * master / 100.0; + master = level * master / 100.0; return master; #endif |