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/equalizer.cpp | |
| parent | 893ffe9a84d497d38e6e472b0cffbd9c37e0c366 (diff) | |
Use span<FloatBufferLine> for EffectState::process output
Diffstat (limited to 'Alc/effects/equalizer.cpp')
| -rw-r--r-- | Alc/effects/equalizer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Alc/effects/equalizer.cpp b/Alc/effects/equalizer.cpp index f6be258b..d37f15ea 100644 --- a/Alc/effects/equalizer.cpp +++ b/Alc/effects/equalizer.cpp @@ -94,7 +94,7 @@ struct EqualizerState 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(EqualizerState) }; @@ -158,9 +158,8 @@ void EqualizerState::update(const ALCcontext *context, const ALeffectslot *slot, } } -void EqualizerState::process(const ALsizei samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei numInput, FloatBufferLine *RESTRICT samplesOut, const ALsizei numOutput) +void EqualizerState::process(const ALsizei samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei numInput, const al::span<FloatBufferLine> samplesOut) { - const al::span<FloatBufferLine> output{samplesOut, samplesOut+numOutput}; ASSUME(numInput > 0); for(ALsizei c{0};c < numInput;c++) { @@ -169,7 +168,7 @@ void EqualizerState::process(const ALsizei samplesToDo, const FloatBufferLine *R mChans[c].filter[2].process(mSampleBuffer, mSampleBuffer, samplesToDo); mChans[c].filter[3].process(mSampleBuffer, mSampleBuffer, samplesToDo); - MixSamples(mSampleBuffer, output, mChans[c].CurrentGains, mChans[c].TargetGains, + MixSamples(mSampleBuffer, samplesOut, mChans[c].CurrentGains, mChans[c].TargetGains, samplesToDo, 0, samplesToDo); } } |