From 04dad28228a694e681d722826615245466a3aa16 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 16 Aug 2011 18:33:10 -0700 Subject: Use mini/maxi/clampi and minu/maxu/clampu to replace min/max calls --- Alc/ALu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Alc/ALu.c') diff --git a/Alc/ALu.c b/Alc/ALu.c index aaf79fe3..a2352de9 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -152,7 +152,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) ALSource->SampleSize; maxstep -= ResamplerPadding[ALSource->Resampler] + ResamplerPrePadding[ALSource->Resampler] + 1; - maxstep = min(maxstep, INT_MAX>>FRACTIONBITS); + maxstep = mini(maxstep, INT_MAX>>FRACTIONBITS); Pitch = Pitch * ALBuffer->Frequency / Frequency; if(Pitch > (ALfloat)maxstep) @@ -677,7 +677,7 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext) ALSource->SampleSize; maxstep -= ResamplerPadding[ALSource->Resampler] + ResamplerPrePadding[ALSource->Resampler] + 1; - maxstep = min(maxstep, INT_MAX>>FRACTIONBITS); + maxstep = mini(maxstep, INT_MAX>>FRACTIONBITS); Pitch = Pitch * ALBuffer->Frequency / Frequency; if(Pitch > (ALfloat)maxstep) @@ -975,7 +975,7 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size) while(size > 0) { /* Setup variables */ - SamplesToDo = min(size, BUFFERSIZE); + SamplesToDo = minu(size, BUFFERSIZE); /* Clear mixing buffer */ memset(device->DryBuffer, 0, SamplesToDo*MAXCHANNELS*sizeof(ALfloat)); -- cgit v1.2.3