3 files changed, 7 insertions, 7 deletions
diff --git a/al/source.cpp b/al/source.cpp
index a8d3e9c6..4a2aaf35 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -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;
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;