aboutsummaryrefslogtreecommitdiffstats
path: root/alc/mixvoice.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-09-16 07:16:31 -0700
committerChris Robinson <[email protected]>2019-09-16 07:16:31 -0700
commitbf2c865d3953370ccf9d56e7a5dc6d2d4c587be1 (patch)
treebf9dd4ec305dfc61dd5d899d883453e94f0612f3 /alc/mixvoice.cpp
parente16e2269b6a18c960a25d58f43ffad5ed408bee9 (diff)
Clean up some more shadowing warnings
Diffstat (limited to 'alc/mixvoice.cpp')
-rw-r--r--alc/mixvoice.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/alc/mixvoice.cpp b/alc/mixvoice.cpp
index 2b5972f3..3d4d9cb8 100644
--- a/alc/mixvoice.cpp
+++ b/alc/mixvoice.cpp
@@ -763,14 +763,14 @@ void ALvoice::mix(State vstate, ALCcontext *Context, const ALuint SamplesToDo)
const al::span<float> nfcsamples{Device->NfcSampleData, DstBufferSize};
size_t chanoffset{outcount};
using FilterProc = void (NfcFilter::*)(float*,const float*,const size_t);
- auto apply_nfc = [this,&parms,samples,TargetGains,Counter,OutPos,&chanoffset,nfcsamples](const FilterProc process, const size_t outcount) -> void
+ auto apply_nfc = [this,&parms,samples,TargetGains,Counter,OutPos,&chanoffset,nfcsamples](const FilterProc process, const size_t chancount) -> void
{
- if(outcount < 1) return;
+ if(chancount < 1) return;
(parms.NFCtrlFilter.*process)(nfcsamples.data(), samples, nfcsamples.size());
- MixSamples(nfcsamples, mDirect.Buffer.subspan(chanoffset, outcount),
+ MixSamples(nfcsamples, mDirect.Buffer.subspan(chanoffset, chancount),
parms.Gains.Current+chanoffset, TargetGains+chanoffset, Counter,
OutPos);
- chanoffset += outcount;
+ chanoffset += chancount;
};
apply_nfc(&NfcFilter::process1, Device->NumChannelsPerOrder[1]);
apply_nfc(&NfcFilter::process2, Device->NumChannelsPerOrder[2]);