3 files changed, 15 insertions, 5 deletions
diff --git a/alc/alu.cpp b/alc/alu.cpp
index 2ab4dcbc..fa362586 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -347,8 +347,13 @@ inline uint dither_rng(uint *seed) noexcept
 
 inline auto& GetAmbiScales(AmbiScaling scaletype) noexcept
 {
-    if(scaletype == AmbiScaling::FuMa) return AmbiScale::FromFuMa();
-    if(scaletype == AmbiScaling::SN3D) return AmbiScale::FromSN3D();
+    switch(scaletype)
+    {
+    case AmbiScaling::FuMa: return AmbiScale::FromFuMa();
+    case AmbiScaling::SN3D: return AmbiScale::FromSN3D();
+    case AmbiScaling::UHJ: return AmbiScale::FromUHJ();
+    case AmbiScaling::N3D: break;
+    }
     return AmbiScale::FromN3D();
 }
 
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp
index ca5a7321..300ddb17 100644
--- a/alc/effects/convolution.cpp
+++ b/alc/effects/convolution.cpp
@@ -91,8 +91,13 @@ void LoadSamples(double *RESTRICT dst, const al::byte *src, const size_t srcstep
 
 inline auto& GetAmbiScales(AmbiScaling scaletype) noexcept
 {
-    if(scaletype == AmbiScaling::FuMa) return AmbiScale::FromFuMa();
-    if(scaletype == AmbiScaling::SN3D) return AmbiScale::FromSN3D();
+    switch(scaletype)
+    {
+    case AmbiScaling::FuMa: return AmbiScale::FromFuMa();
+    case AmbiScaling::SN3D: return AmbiScale::FromSN3D();
+    case AmbiScaling::UHJ: return AmbiScale::FromUHJ();
+    case AmbiScaling::N3D: break;
+    }
     return AmbiScale::FromN3D();
 }
 
diff --git a/alc/panning.cpp b/alc/panning.cpp
index 2c99d978..d5fb1cf5 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -844,7 +844,7 @@ void InitUhjPanning(ALCdevice *device)
     auto acnmap_begin = AmbiIndex::FromFuMa().begin();
     std::transform(acnmap_begin, acnmap_begin + count, std::begin(device->Dry.AmbiMap),
         [](const uint8_t &acn) noexcept -> BFChannelConfig
-        { return BFChannelConfig{1.0f/AmbiScale::FromFuMa()[acn], acn}; });
+        { return BFChannelConfig{1.0f/AmbiScale::FromUHJ()[acn], acn}; });
     AllocChannels(device, count, device->channelsFromFmt());
 }