diff options
| author | Chris Robinson <[email protected]> | 2021-03-31 20:46:03 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2021-03-31 21:02:30 -0700 |
| commit | f33edc3b30ee2975464b308f800f6918c0362283 (patch) | |
| tree | 285ba54c9c791d596e880f3b3a4ebfb2ddbe87b5 /al/source.cpp | |
| parent | b5e36007f136f817e6d14685377e781e224daf17 (diff) | |
Add support for 4-channel UHJ
Also add the SOFT moniker to the new macros
Diffstat (limited to 'al/source.cpp')
| -rw-r--r-- | al/source.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; |