diff options
| author | Chris Robinson <chris.kcat@gmail.com> | 2023-01-05 01:47:55 -0800 |
|---|---|---|
| committer | Chris Robinson <chris.kcat@gmail.com> | 2023-01-05 01:47:55 -0800 |
| commit | 23c8a35505fe6ab7a5c87754911a133b23ac75cf (patch) | |
| tree | d36b9dabb413680d8074f3e8aad0084691d20813 /alc | |
| parent | 58a18ab3c0126337d17939b5060fce28a39b8cf1 (diff) | |
Add and use mixers that process one input and output channel
Diffstat (limited to 'alc')
| -rw-r--r-- | alc/effects/autowah.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/equalizer.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/modulator.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/vmorpher.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp index 8dfee45d..581476a2 100644 --- a/alc/effects/autowah.cpp +++ b/alc/effects/autowah.cpp @@ -214,8 +214,8 @@ void AutowahState::process(const size_t samplesToDo, chandata->mFilter.z2 = z2; /* Now, mix the processed sound data to the output. */ - MixSamples({mBufferOut, samplesToDo}, {&samplesOut[outidx], 1}, &chandata->mCurrentGain, - &chandata->mTargetGain, samplesToDo, 0); + MixSamples({mBufferOut, samplesToDo}, samplesOut[outidx].data(), chandata->mCurrentGain, + chandata->mTargetGain, samplesToDo); ++chandata; } } diff --git a/alc/effects/equalizer.cpp b/alc/effects/equalizer.cpp index de067911..52c491ec 100644 --- a/alc/effects/equalizer.cpp +++ b/alc/effects/equalizer.cpp @@ -182,8 +182,8 @@ void EqualizerState::process(const size_t samplesToDo, const al::span<const Floa DualBiquad{chan->mFilter[0], chan->mFilter[1]}.process(inbuf, buffer.begin()); DualBiquad{chan->mFilter[2], chan->mFilter[3]}.process(buffer, buffer.begin()); - MixSamples(buffer, {&samplesOut[outidx], 1}, &chan->mCurrentGain, &chan->mTargetGain, - samplesToDo, 0u); + MixSamples(buffer, samplesOut[outidx].data(), chan->mCurrentGain, chan->mTargetGain, + samplesToDo); } ++chan; } diff --git a/alc/effects/modulator.cpp b/alc/effects/modulator.cpp index 29009247..5699badf 100644 --- a/alc/effects/modulator.cpp +++ b/alc/effects/modulator.cpp @@ -168,8 +168,8 @@ void ModulatorState::process(const size_t samplesToDo, const al::span<const Floa for(size_t i{0u};i < td;i++) temps[i] *= modsamples[i]; - MixSamples({temps, td}, {&samplesOut[outidx], 1}, &chandata->mCurrentGain, - &chandata->mTargetGain, samplesToDo-base, base); + MixSamples({temps, td}, samplesOut[outidx].data()+base, chandata->mCurrentGain, + chandata->mTargetGain, samplesToDo-base); } ++chandata; } diff --git a/alc/effects/vmorpher.cpp b/alc/effects/vmorpher.cpp index 869c004e..81869dca 100644 --- a/alc/effects/vmorpher.cpp +++ b/alc/effects/vmorpher.cpp @@ -326,8 +326,8 @@ void VmorpherState::process(const size_t samplesToDo, const al::span<const Float blended[i] = lerpf(mSampleBufferA[i], mSampleBufferB[i], mLfo[i]); /* Now, mix the processed sound data to the output. */ - MixSamples({blended, td}, {&samplesOut[outidx], 1}, &chandata->mCurrentGain, - &chandata->mTargetGain, samplesToDo-base, base); + MixSamples({blended, td}, samplesOut[outidx].data()+base, chandata->mCurrentGain, + chandata->mTargetGain, samplesToDo-base); ++chandata; } |