AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename Voice::mNumChannels for clarity

Browse Source
This commit is contained in:
Chris Robinson 2021-12-15 14:28:26 -08:00
parent a051909c35
commit edea2b2a02
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
al/source.cpp
View File

@ -497,7 +497,7 @@ void InitVoice(Voice *voice, ALsource *source, ALbufferQueueItem *BufferList, AL
(buffer->mChannels == FmtStereo && source->mStereoMode == SourceStereo::Enhanced) ?
FmtSuperStereo : buffer->mChannels;
voice->mFmtType = buffer->mType;
voice->mNumChannels = buffer->channelsFromFmt();
voice->mFrameStep = buffer->channelsFromFmt();
voice->mFrameSize = buffer->frameSizeFromFmt();
voice->mAmbiLayout = IsUHJ(voice->mFmtChannels) ? AmbiLayout::FuMa : buffer->mAmbiLayout;
voice->mAmbiScaling = IsUHJ(voice->mFmtChannels) ? AmbiScaling::UHJ : buffer->mAmbiScaling;

8
core/voice.cpp
View File

@ -591,8 +591,8 @@ void Voice::mix(const State vstate, ContextBase *Context, const uint SamplesToDo
++prevSamples;
}
if((mFlags&VoiceIsStatic))
LoadBufferStatic(BufferListItem, BufferLoopItem, DataPosInt, mFmtType, mFmtChannels,
mNumChannels, SrcBufferSize, MixingSamples);
LoadBufferStatic(BufferListItem, BufferLoopItem, DataPosInt, mFmtType,
mFmtChannels, mFrameStep, SrcBufferSize, MixingSamples);
else if((mFlags&VoiceIsCallback))
{
if(!(mFlags&VoiceCallbackStopped))
@ -617,11 +617,11 @@ void Voice::mix(const State vstate, ContextBase *Context, const uint SamplesToDo
}
}
LoadBufferCallback(BufferListItem, mNumCallbackSamples, mFmtType, mFmtChannels,
mNumChannels, SrcBufferSize, MixingSamples);
mFrameStep, SrcBufferSize, MixingSamples);
}
else
LoadBufferQueue(BufferListItem, BufferLoopItem, DataPosInt, mFmtType, mFmtChannels,
mNumChannels, SrcBufferSize, MixingSamples);
mFrameStep, SrcBufferSize, MixingSamples);
if(mDecoder)
{

4
core/voice.h
View File

@ -208,8 +208,8 @@ struct Voice {
FmtChannels mFmtChannels;
FmtType mFmtType;
uint mFrequency;
uint mNumChannels;
uint mFrameSize;
uint mFrameStep; /**< In steps of the sample type size. */
uint mFrameSize; /**< In bytes. */
AmbiLayout mAmbiLayout;
AmbiScaling mAmbiScaling;
uint mAmbiOrder;