diff options
| author | Chris Robinson <[email protected]> | 2022-09-04 13:38:54 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2022-09-04 13:38:54 -0700 |
| commit | 92d135de3c5ef80f9d8e7d453f23954d47e46489 (patch) | |
| tree | f61a620ff3cd52961e87d83880a1665a6f73ff47 /alc/effects | |
| parent | 14bb4ad1b7a0126fe5dfdd2e62bea750ce12d961 (diff) | |
Track if doing 2D mixing only
And use it to select the proper HF scales
Diffstat (limited to 'alc/effects')
| -rw-r--r-- | alc/effects/convolution.cpp | 3 | ||||
| -rw-r--r-- | alc/effects/reverb.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp index 26a99ef9..f655cf89 100644 --- a/alc/effects/convolution.cpp +++ b/alc/effects/convolution.cpp @@ -420,7 +420,8 @@ void ConvolutionState::update(const ContextBase *context, const EffectSlot *slot if(device->mAmbiOrder > mAmbiOrder) { mMix = &ConvolutionState::UpsampleMix; - const auto scales = AmbiScale::GetHFOrderScales(mAmbiOrder, device->mAmbiOrder, false); + const auto scales = AmbiScale::GetHFOrderScales(mAmbiOrder, device->mAmbiOrder, + device->m2DMixing); (*mChans)[0].mHfScale = scales[0]; for(size_t i{1};i < mChans->size();++i) (*mChans)[i].mHfScale = scales[1]; diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp index 554fb341..dd89dccd 100644 --- a/alc/effects/reverb.cpp +++ b/alc/effects/reverb.cpp @@ -686,7 +686,7 @@ void ReverbState::deviceUpdate(const DeviceBase *device, const Buffer&) if(device->mAmbiOrder > 1) { mUpmixOutput = true; - mOrderScales = AmbiScale::GetHFOrderScales(1, device->mAmbiOrder, false); + mOrderScales = AmbiScale::GetHFOrderScales(1, device->mAmbiOrder, device->m2DMixing); } else { |