diff options
| author | Chris Robinson <[email protected]> | 2010-11-29 19:48:18 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2010-11-29 19:48:18 -0800 |
| commit | 0cf32e29465830e7d79eb3d40bb85e328d43625a (patch) | |
| tree | 6c54363145fbb3a84eb0ebef99a56460a2292da6 /Alc | |
| parent | 693ab4d8bc34cdc5a394eca45b2648f21613c917 (diff) | |
Reorder some parameters for consistency
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/ALu.c | 8 | ||||
| -rw-r--r-- | Alc/mixer.c | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -220,8 +220,8 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) ALbuffer *ALBuffer; if((ALBuffer=BufferListItem->buffer) != NULL) { - ALint maxstep = STACK_DATA_SIZE / FrameSizeFromFmt(ALBuffer->FmtType, - ALBuffer->FmtChannels); + ALint maxstep = STACK_DATA_SIZE / FrameSizeFromFmt(ALBuffer->FmtChannels, + ALBuffer->FmtType); maxstep -= ResamplerPadding[ALSource->Resampler] + ResamplerPrePadding[ALSource->Resampler] + 1; maxstep = min(maxstep, INT_MAX>>FRACTIONBITS); @@ -698,8 +698,8 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext) ALbuffer *ALBuffer; if((ALBuffer=BufferListItem->buffer) != NULL) { - ALint maxstep = STACK_DATA_SIZE / FrameSizeFromFmt(ALBuffer->FmtType, - ALBuffer->FmtChannels); + ALint maxstep = STACK_DATA_SIZE / FrameSizeFromFmt(ALBuffer->FmtChannels, + ALBuffer->FmtType); maxstep -= ResamplerPadding[ALSource->Resampler] + ResamplerPrePadding[ALSource->Resampler] + 1; maxstep = min(maxstep, INT_MAX>>FRACTIONBITS); diff --git a/Alc/mixer.c b/Alc/mixer.c index 020375da..9f19d5df 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -705,7 +705,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo) { FmtChannels = ALBuffer->FmtChannels; FmtType = ALBuffer->FmtType; - FrameSize = FrameSizeFromFmt(FmtType, FmtChannels); + FrameSize = FrameSizeFromFmt(FmtChannels, FmtType); break; } BufferListItem = BufferListItem->next; |