diff options
| author | Chris Robinson <[email protected]> | 2019-05-29 22:31:36 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-05-29 22:31:36 -0700 |
| commit | 2909f263fd1a2e7122b0345c6d11209084815fd1 (patch) | |
| tree | 43fc5530d46f50edd7e5ca95f9c2d3dd4c95d3fc /Alc/effects/chorus.cpp | |
| parent | 893ffe9a84d497d38e6e472b0cffbd9c37e0c366 (diff) | |
Use span<FloatBufferLine> for EffectState::process output
Diffstat (limited to 'Alc/effects/chorus.cpp')
| -rw-r--r-- | Alc/effects/chorus.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Alc/effects/chorus.cpp b/Alc/effects/chorus.cpp index cdbb2036..9226c747 100644 --- a/Alc/effects/chorus.cpp +++ b/Alc/effects/chorus.cpp @@ -101,7 +101,7 @@ struct ChorusState final : public EffectState { ALboolean deviceUpdate(const ALCdevice *device) override; void update(const ALCcontext *context, const ALeffectslot *slot, const EffectProps *props, const EffectTarget target) override; - void process(const ALsizei samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei numInput, FloatBufferLine *RESTRICT samplesOut, const ALsizei numOutput) override; + void process(const ALsizei samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei numInput, const al::span<FloatBufferLine> samplesOut) override; DEF_NEWDEL(ChorusState) }; @@ -198,7 +198,7 @@ void ChorusState::update(const ALCcontext *Context, const ALeffectslot *Slot, co } } -void ChorusState::process(const ALsizei samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei /*numInput*/, FloatBufferLine *RESTRICT samplesOut, const ALsizei numOutput) +void ChorusState::process(const ALsizei samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei /*numInput*/, const al::span<FloatBufferLine> samplesOut) { const auto bufmask = static_cast<ALsizei>(mSampleBuffer.size()-1); const ALfloat feedback{mFeedback}; @@ -206,7 +206,6 @@ void ChorusState::process(const ALsizei samplesToDo, const FloatBufferLine *REST ALfloat *RESTRICT delaybuf{mSampleBuffer.data()}; ALsizei offset{mOffset}; - const al::span<FloatBufferLine> output{samplesOut, samplesOut+numOutput}; for(ALsizei base{0};base < samplesToDo;) { const ALsizei todo = mini(256, samplesToDo-base); @@ -254,7 +253,7 @@ void ChorusState::process(const ALsizei samplesToDo, const FloatBufferLine *REST } for(ALsizei c{0};c < 2;c++) - MixSamples(temps[c], output, mGains[c].Current, mGains[c].Target, samplesToDo-base, + MixSamples(temps[c], samplesOut, mGains[c].Current, mGains[c].Target, samplesToDo-base, base, todo); base += todo; |