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

Reorder some parameters for consistency

Browse Source
This commit is contained in:
Chris Robinson
2010-11-29 19:48:18 -08:00
parent 693ab4d8bc
commit 0cf32e2946
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/ALu.c
+4 -4
View File
@@ -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);
Alc/mixer.c
+1 -1
View File
@@ -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;
OpenAL32/Include/alBuffer.h
+5 -5
View File
@@ -34,10 +34,10 @@ void DecomposeInputFormat(ALenum format, enum SrcFmtChannels *chans,
enum SrcFmtType *type);
ALuint BytesFromSrcFmt(enum SrcFmtType type);
ALuint ChannelsFromSrcFmt(enum SrcFmtChannels chans);
static __inline ALuint FrameSizeFromSrcFmt(enum SrcFmtType type,
enum SrcFmtChannels chans)
static __inline ALuint FrameSizeFromSrcFmt(enum SrcFmtChannels chans,
enum SrcFmtType type)
{
return BytesFromSrcFmt(type) * ChannelsFromSrcFmt(chans);
return ChannelsFromSrcFmt(chans) * BytesFromSrcFmt(type);
}
@@ -60,9 +60,9 @@ enum FmtChannels {
void DecomposeFormat(ALenum format, enum FmtChannels *chans, enum FmtType *type);
ALuint BytesFromFmt(enum FmtType type);
ALuint ChannelsFromFmt(enum FmtChannels chans);
static __inline ALuint FrameSizeFromFmt(enum FmtType type, enum FmtChannels chans)
static __inline ALuint FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type)
{
return BytesFromFmt(type) * ChannelsFromFmt(chans);
return ChannelsFromFmt(chans) * BytesFromFmt(type);
}
OpenAL32/alBuffer.c
+1 -1
View File
@@ -704,7 +704,7 @@ AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum eParam, const ALint* pl
else
{
ALint maxlen = ALBuf->size /
FrameSizeFromFmt(ALBuf->FmtType, ALBuf->FmtChannels);
FrameSizeFromFmt(ALBuf->FmtChannels, ALBuf->FmtType);
if(plValues[0] > maxlen || plValues[1] > maxlen)
alSetError(pContext, AL_INVALID_VALUE);
else
OpenAL32/alSource.c
+4 -4
View File
@@ -1953,7 +1953,7 @@ static ALboolean ApplyOffset(ALsource *Source)
// SW Mixer Positions are in Samples
Source->position = (lByteOffset - lTotalBufferSize) /
FrameSizeFromFmt(Buffer->FmtType, Buffer->FmtChannels);
FrameSizeFromFmt(Buffer->FmtChannels, Buffer->FmtType);
return AL_TRUE;
}
@@ -2014,17 +2014,17 @@ static ALint GetByteOffset(ALsource *Source)
}
else
ByteOffset /= FrameSizeFromSrcFmt(Buffer->OriginalChannels, Buffer->OriginalType);
ByteOffset *= FrameSizeFromFmt(Buffer->FmtType, Buffer->FmtChannels);
ByteOffset *= FrameSizeFromFmt(Buffer->FmtChannels, Buffer->FmtType);
break;
case AL_SAMPLE_OFFSET:
ByteOffset = Source->lOffset * FrameSizeFromFmt(Buffer->FmtType, Buffer->FmtChannels);
ByteOffset = Source->lOffset * FrameSizeFromFmt(Buffer->FmtChannels, Buffer->FmtType);
break;
case AL_SEC_OFFSET:
// Note - lOffset is internally stored as Milliseconds
ByteOffset = (ALint)(Source->lOffset / 1000.0 * Buffer->Frequency);
ByteOffset *= FrameSizeFromFmt(Buffer->FmtType, Buffer->FmtChannels);
ByteOffset *= FrameSizeFromFmt(Buffer->FmtChannels, Buffer->FmtType);
break;
}
// Clear Offset