diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/voice.cpp | 8 | ||||
| -rw-r--r-- | core/voice.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/voice.cpp b/core/voice.cpp index d93a4a18..4cda0c30 100644 --- a/core/voice.cpp +++ b/core/voice.cpp @@ -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) { diff --git a/core/voice.h b/core/voice.h index 8866f8d4..8b5ae37f 100644 --- a/core/voice.h +++ b/core/voice.h @@ -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; |