From db4de2b56a597c9997634f58fd3621e087acd825 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 21 Jan 2021 06:25:50 -0800
Subject: [PATCH] Avoid declaring some variables multiple times

---
 alc/voice.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/alc/voice.cpp b/alc/voice.cpp
index 54357f06..47484452 100644
--- a/alc/voice.cpp
+++ b/alc/voice.cpp
@@ -582,12 +582,11 @@ void Voice::mix(const State vstate, ALCcontext *Context, const uint SamplesToDo)
         }
 
         const float fadeVal{fadeGain};
+        const size_t num_chans{mChans.size()};
+        size_t chan_idx{0};
         ASSUME(DstBufferSize > 0);
         for(auto &chandata : mChans)
         {
-            const size_t num_chans{mChans.size()};
-            const auto chan = static_cast<size_t>(std::distance(mChans.data(),
-                std::addressof(chandata)));
             const al::span<float> SrcData{Device->SourceData, SrcBufferSize};
 
             /* Load the previous samples into the source data first, then load
@@ -601,13 +600,13 @@ void Voice::mix(const State vstate, ALCcontext *Context, const uint SamplesToDo)
                     chandata.mPrevSamples.end(), srciter);
             else if((mFlags&VoiceIsStatic))
                 srciter = LoadBufferStatic(BufferListItem, BufferLoopItem, num_chans,
-                    SampleSize, chan, DataPosInt, {srciter, SrcData.end()});
+                    SampleSize, chan_idx, DataPosInt, {srciter, SrcData.end()});
             else if((mFlags&VoiceIsCallback))
-                srciter = LoadBufferCallback(BufferListItem, num_chans, SampleSize, chan,
+                srciter = LoadBufferCallback(BufferListItem, num_chans, SampleSize, chan_idx,
                     mNumCallbackSamples, {srciter, SrcData.end()});
             else
                 srciter = LoadBufferQueue(BufferListItem, BufferLoopItem, num_chans,
-                    SampleSize, chan, DataPosInt, {srciter, SrcData.end()});
+                    SampleSize, chan_idx, DataPosInt, {srciter, SrcData.end()});
 
             if UNLIKELY(srciter != SrcData.end())
             {
@@ -685,6 +684,8 @@ void Voice::mix(const State vstate, ALCcontext *Context, const uint SamplesToDo)
                 MixSamples({samples, DstBufferSize}, mSend[send].Buffer,
                     parms.Gains.Current.data(), TargetGains, Counter, OutPos);
             }
+
+            ++chan_idx;
         }
         /* Update positions */
         DataPosFrac += increment*DstBufferSize;