From f33edc3b30ee2975464b308f800f6918c0362283 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 31 Mar 2021 20:46:03 -0700 Subject: Add support for 4-channel UHJ Also add the SOFT moniker to the new macros --- alc/effects/convolution.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'alc/effects/convolution.cpp') diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp index 1ee59604..5bb52656 100644 --- a/alc/effects/convolution.cpp +++ b/alc/effects/convolution.cpp @@ -382,7 +382,7 @@ void ConvolutionState::update(const ALCcontext *context, const EffectSlot *slot, * Not that UHJ should really ever be used for convolution, but it's a * valid format regardless. */ - if((mChannels == FmtUHJ2 || mChannels == FmtUHJ3) && target.RealOut + if((mChannels == FmtUHJ2 || mChannels == FmtUHJ3 || mChannels == FmtUHJ4) && target.RealOut && target.RealOut->ChannelIndex[FrontLeft] != INVALID_CHANNEL_INDEX && target.RealOut->ChannelIndex[FrontRight] != INVALID_CHANNEL_INDEX) { @@ -436,6 +436,7 @@ void ConvolutionState::update(const ALCcontext *context, const EffectSlot *slot, case FmtBFormat3D: case FmtUHJ2: case FmtUHJ3: + case FmtUHJ4: break; } -- cgit v1.2.3