More merges from resolve-shadow warnings:

utils/
  codecs/
  and a change I missed from formats/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-07 15:16:48 +00:00
parent 8397209316
commit 6305009cfc
8 changed files with 107 additions and 108 deletions

View File

@@ -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