From b54bb388a3dbd92518beef4bda03df5854aad1a9 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 24 Apr 2021 08:28:13 -0700 Subject: Create a base the ALCdevice and ALCcontext structs A base that contains the API-agnostic data, with ALCdevice and ALCcontext being for AL-specific data. --- alc/effects/convolution.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'alc/effects/convolution.cpp') diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp index 5bb52656..0a1bd214 100644 --- a/alc/effects/convolution.cpp +++ b/alc/effects/convolution.cpp @@ -190,8 +190,8 @@ struct ConvolutionState final : public EffectState { void (ConvolutionState::*mMix)(const al::span,const size_t) {&ConvolutionState::NormalMix}; - void deviceUpdate(const ALCdevice *device, const Buffer &buffer) override; - void update(const ALCcontext *context, const EffectSlot *slot, const EffectProps *props, + void deviceUpdate(const DeviceBase *device, const Buffer &buffer) override; + void update(const ContextBase *context, const EffectSlot *slot, const EffectProps *props, const EffectTarget target) override; void process(const size_t samplesToDo, const al::span samplesIn, const al::span samplesOut) override; @@ -219,7 +219,7 @@ void ConvolutionState::UpsampleMix(const al::span samplesOut, } -void ConvolutionState::deviceUpdate(const ALCdevice *device, const Buffer &buffer) +void ConvolutionState::deviceUpdate(const DeviceBase *device, const Buffer &buffer) { constexpr uint MaxConvolveAmbiOrder{1u}; @@ -316,7 +316,7 @@ void ConvolutionState::deviceUpdate(const ALCdevice *device, const Buffer &buffe } -void ConvolutionState::update(const ALCcontext *context, const EffectSlot *slot, +void ConvolutionState::update(const ContextBase *context, const EffectSlot *slot, const EffectProps* /*props*/, const EffectTarget target) { /* NOTE: Stereo and Rear are slightly different from normal mixing (as @@ -394,7 +394,7 @@ void ConvolutionState::update(const ALCcontext *context, const EffectSlot *slot, } else if(mChannels == FmtBFormat3D || mChannels == FmtBFormat2D) { - ALCdevice *device{context->mDevice.get()}; + DeviceBase *device{context->mDevice}; if(device->mAmbiOrder > mAmbiOrder) { mMix = &ConvolutionState::UpsampleMix; @@ -421,7 +421,7 @@ void ConvolutionState::update(const ALCcontext *context, const EffectSlot *slot, } else { - ALCdevice *device{context->mDevice.get()}; + DeviceBase *device{context->mDevice}; al::span chanmap{}; switch(mChannels) { -- cgit v1.2.3