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 --- al/source.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'al/source.cpp') diff --git a/al/source.cpp b/al/source.cpp index 6d56549a..72337d74 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -444,10 +444,10 @@ void InitVoice(Voice *voice, ALsource *source, ALbufferQueueItem *BufferList, AL voice->mFmtChannels = buffer->mChannels; voice->mFmtType = buffer->mType; voice->mFrameSize = buffer->frameSizeFromFmt(); - voice->mAmbiLayout = (buffer->mChannels==FmtUHJ2 || buffer->mChannels==FmtUHJ3) ? - AmbiLayout::FuMa : buffer->mAmbiLayout; - voice->mAmbiScaling = (buffer->mChannels==FmtUHJ2 || buffer->mChannels==FmtUHJ3) ? - AmbiScaling::FuMa : buffer->mAmbiScaling; + voice->mAmbiLayout = (buffer->mChannels == FmtUHJ2 || buffer->mChannels == FmtUHJ3 + || voice->mFmtChannels == FmtUHJ4) ? AmbiLayout::FuMa : buffer->mAmbiLayout; + voice->mAmbiScaling = (buffer->mChannels == FmtUHJ2 || buffer->mChannels == FmtUHJ3 + || voice->mFmtChannels == FmtUHJ4) ? AmbiScaling::FuMa : buffer->mAmbiScaling; voice->mAmbiOrder = buffer->mAmbiOrder; if(buffer->mCallback) voice->mFlags |= VoiceIsCallback; -- cgit v1.2.3