From 34331c0dfaeecb40d4bbe771cdb65dfe5aa9f7a5 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 19 Aug 2019 09:14:54 -0700 Subject: Fix for GCC5 decaying an array to a pointer --- alc/effects/reverb.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp index 31a44f5b..f12e5ed9 100644 --- a/alc/effects/reverb.cpp +++ b/alc/effects/reverb.cpp @@ -424,7 +424,7 @@ struct ReverbState final : public EffectState { for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(mTempLine.begin(), todo, 0.0f); - MixRowSamples(mTempLine.data(), A2B[c], mEarlySamples[0].data(), + MixRowSamples(mTempLine.data(), {A2B[c], NUM_LINES}, mEarlySamples[0].data(), mEarlySamples[0].size(), todo); MixSamples(mTempLine.data(), samplesOut, mEarly.CurrentGain[c], mEarly.PanGain[c], counter, offset, todo); @@ -432,8 +432,8 @@ struct ReverbState final : public EffectState { for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(mTempLine.begin(), todo, 0.0f); - MixRowSamples(mTempLine.data(), A2B[c], mLateSamples[0].data(), mLateSamples[0].size(), - todo); + MixRowSamples(mTempLine.data(), {A2B[c], NUM_LINES}, mLateSamples[0].data(), + mLateSamples[0].size(), todo); MixSamples(mTempLine.data(), samplesOut, mLate.CurrentGain[c], mLate.PanGain[c], counter, offset, todo); } @@ -447,7 +447,7 @@ struct ReverbState final : public EffectState { for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(mTempLine.begin(), todo, 0.0f); - MixRowSamples(mTempLine.data(), A2B[c], mEarlySamples[0].data(), + MixRowSamples(mTempLine.data(), {A2B[c], NUM_LINES}, mEarlySamples[0].data(), mEarlySamples[0].size(), todo); /* Apply scaling to the B-Format's HF response to "upsample" it to @@ -462,8 +462,8 @@ struct ReverbState final : public EffectState { for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(mTempLine.begin(), todo, 0.0f); - MixRowSamples(mTempLine.data(), A2B[c], mLateSamples[0].data(), mLateSamples[0].size(), - todo); + MixRowSamples(mTempLine.data(), {A2B[c], NUM_LINES}, mLateSamples[0].data(), + mLateSamples[0].size(), todo); const ALfloat hfscale{(c==0) ? mOrderScales[0] : mOrderScales[1]}; mAmbiSplitter[1][c].applyHfScale(mTempLine.data(), hfscale, todo); -- cgit v1.2.3