diff options
author | Chris Robinson <[email protected]> | 2011-08-16 04:21:58 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2011-08-16 04:21:58 -0700 |
commit | 8a51a7ea2d5234555f00cf9a391eefceb1989efa (patch) | |
tree | 394772e084fd2a21776a1872bdc267bd9f6de53c /Alc/alcReverb.c | |
parent | b3cb511c06e669a2024025fc3b3206674c70d737 (diff) |
Use inline minF/maxF/clampF functions instead of the __min/__max macros
Diffstat (limited to 'Alc/alcReverb.c')
-rw-r--r-- | Alc/alcReverb.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Alc/alcReverb.c b/Alc/alcReverb.c index 4f9360b8..e4fb4ebf 100644 --- a/Alc/alcReverb.c +++ b/Alc/alcReverb.c @@ -388,13 +388,10 @@ static ALfloat CalcLimitedHfRatio(ALfloat hfRatio, ALfloat airAbsorptionGainHF, */ limitRatio = 1.0f / (CalcDecayLength(airAbsorptionGainHF, decayTime) * SPEEDOFSOUNDMETRESPERSEC); - // Need to limit the result to a minimum of 0.1, just like the HF ratio - // parameter. - limitRatio = __max(limitRatio, 0.1f); - - // Using the limit calculated above, apply the upper bound to the HF - // ratio. - return __min(hfRatio, limitRatio); + /* Using the limit calculated above, apply the upper bound to the HF + * ratio. Also need to limit the result to a minimum of 0.1, just like the + * HF ratio parameter. */ + return clampF(limitRatio, 0.1f, hfRatio); } // Calculate the coefficient for a HF (and eventually LF) decay damping @@ -418,7 +415,7 @@ static __inline ALfloat CalcDampingCoeff(ALfloat hfRatio, ALfloat length, ALfloa // Very low decay times will produce minimal output, so apply an // upper bound to the coefficient. - coeff = __min(coeff, 0.98f); + coeff = minF(coeff, 0.98f); } return coeff; } |