diff options
author | Chris Robinson <[email protected]> | 2020-12-27 00:14:58 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2020-12-27 00:14:58 -0800 |
commit | e20143fcc42e4a39b365b3f1395dfde94a30ac31 (patch) | |
tree | ab9324a678d0d4ea7316836da1629581538a9fa8 /alc/panning.cpp | |
parent | 507cbfa0271e6183a06c5b2eec3465bc37a108e5 (diff) |
Move the WetBuffer reference to EffectSlot
Diffstat (limited to 'alc/panning.cpp')
-rw-r--r-- | alc/panning.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/alc/panning.cpp b/alc/panning.cpp index 0dc77621..37f016fa 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -1042,7 +1042,7 @@ no_hrtf: } -void aluInitEffectPanning(ALeffectslot *slot, ALCcontext *context) +void aluInitEffectPanning(EffectSlot *slot, ALCcontext *context) { ALCdevice *device{context->mDevice.get()}; const size_t count{AmbiChannelsFromOrder(device->mAmbiOrder)}; @@ -1059,7 +1059,7 @@ void aluInitEffectPanning(ALeffectslot *slot, ALCcontext *context) if(wetbuffer_iter->get() == slot->mWetBuffer) { slot->mWetBuffer = nullptr; - slot->mSlot.Wet.Buffer = {}; + slot->Wet.Buffer = {}; *wetbuffer_iter = WetBufferPtr{new(FamCount(count)) WetBuffer{count}}; @@ -1087,12 +1087,11 @@ void aluInitEffectPanning(ALeffectslot *slot, ALCcontext *context) wetbuffer->mInUse = true; auto acnmap_end = AmbiIndex::FromACN.begin() + count; - auto iter = std::transform(AmbiIndex::FromACN.begin(), acnmap_end, - slot->mSlot.Wet.AmbiMap.begin(), + auto iter = std::transform(AmbiIndex::FromACN.begin(), acnmap_end, slot->Wet.AmbiMap.begin(), [](const uint8_t &acn) noexcept -> BFChannelConfig { return BFChannelConfig{1.0f, acn}; }); - std::fill(iter, slot->mSlot.Wet.AmbiMap.end(), BFChannelConfig{}); - slot->mSlot.Wet.Buffer = wetbuffer->mBuffer; + std::fill(iter, slot->Wet.AmbiMap.end(), BFChannelConfig{}); + slot->Wet.Buffer = wetbuffer->mBuffer; } |