AerialX/openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Declare some variables closer to where they're used

Browse Source
This commit is contained in:
Chris Robinson 2011-06-29 23:32:48 -07:00
parent 5736bbc3e4
commit 032d0836a7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Alc/ALu.c
View File

@ -373,14 +373,11 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
ALfloat DryGainHF; ALfloat DryGainHF;
ALfloat WetGain[MAX_SENDS]; ALfloat WetGain[MAX_SENDS];
ALfloat WetGainHF[MAX_SENDS]; ALfloat WetGainHF[MAX_SENDS];
ALfloat DirGain, AmbientGain;
const ALfloat *SpeakerGain;
ALfloat Pitch; ALfloat Pitch;
ALfloat length;
ALuint Frequency; ALuint Frequency;
ALint NumSends; ALint NumSends;
ALint pos, s, i;
ALfloat cw; ALfloat cw;
ALint i;
DryGainHF = 1.0f; DryGainHF = 1.0f;
for(i = 0;i < MAX_SENDS;i++) for(i = 0;i < MAX_SENDS;i++)
@ -726,6 +723,11 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
} }
else else
{ {
ALfloat DirGain, AmbientGain;
const ALfloat *SpeakerGain;
ALfloat length;
ALint pos;
length = __max(Distance, MinDist); length = __max(Distance, MinDist);
if(length > 0.0f) if(length > 0.0f)
{ {
@ -742,15 +744,15 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
// elevation adjustment for directional gain. this sucks, but // elevation adjustment for directional gain. this sucks, but
// has low complexity // has low complexity
AmbientGain = aluSqrt(1.0/Device->NumChan); AmbientGain = aluSqrt(1.0/Device->NumChan);
for(s = 0;s < MAXCHANNELS;s++) for(i = 0;i < MAXCHANNELS;i++)
{ {
ALuint s2; ALuint i2;
for(s2 = 0;s2 < MAXCHANNELS;s2++) for(i2 = 0;i2 < MAXCHANNELS;i2++)
ALSource->Params.DryGains[s][s2] = 0.0f; ALSource->Params.DryGains[i][i2] = 0.0f;
} }
for(s = 0;s < (ALsizei)Device->NumChan;s++) for(i = 0;i < (ALint)Device->NumChan;i++)
{ {
Channel chan = Device->Speaker2Chan[s]; Channel chan = Device->Speaker2Chan[i];
ALfloat gain = lerp(AmbientGain, SpeakerGain[chan], DirGain); ALfloat gain = lerp(AmbientGain, SpeakerGain[chan], DirGain);
ALSource->Params.DryGains[0][chan] = DryGain * gain; ALSource->Params.DryGains[0][chan] = DryGain * gain;
} }