Use inline variables instead of functions with static variables

6 files changed, 139 insertions, 178 deletions

diff --git a/alc/alu.cpp b/alc/alu.cpp
index 0130f280..5dfb4fae 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -376,28 +376,28 @@ void UpsampleBFormatTransform(
 }
 
 
-inline auto& GetAmbiScales(AmbiScaling scaletype) noexcept
+constexpr auto GetAmbiScales(AmbiScaling scaletype) noexcept
 {
     switch(scaletype)
     {
-    case AmbiScaling::FuMa: return AmbiScale::FromFuMa();
-    case AmbiScaling::SN3D: return AmbiScale::FromSN3D();
-    case AmbiScaling::UHJ: return AmbiScale::FromUHJ();
+    case AmbiScaling::FuMa: return al::span{AmbiScale::FromFuMa};
+    case AmbiScaling::SN3D: return al::span{AmbiScale::FromSN3D};
+    case AmbiScaling::UHJ: return al::span{AmbiScale::FromUHJ};
     case AmbiScaling::N3D: break;
     }
-    return AmbiScale::FromN3D();
+    return al::span{AmbiScale::FromN3D};
 }
 
-inline auto& GetAmbiLayout(AmbiLayout layouttype) noexcept
+constexpr auto GetAmbiLayout(AmbiLayout layouttype) noexcept
 {
-    if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa();
-    return AmbiIndex::FromACN();
+    if(layouttype == AmbiLayout::FuMa) return al::span{AmbiIndex::FromFuMa};
+    return al::span{AmbiIndex::FromACN};
 }
 
-inline auto& GetAmbi2DLayout(AmbiLayout layouttype) noexcept
+constexpr auto GetAmbi2DLayout(AmbiLayout layouttype) noexcept
 {
-    if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa2D();
-    return AmbiIndex::FromACN2D();
+    if(layouttype == AmbiLayout::FuMa) return al::span{AmbiIndex::FromFuMa2D};
+    return al::span{AmbiIndex::FromACN2D};
 }
 
 
@@ -859,7 +859,7 @@ void CalcPanningAndFilters(Voice *voice, const float xpos, const float ypos, con
              */
             return CalcAngleCoeffs(ScaleAzimuthFront(az, 1.5f), ev, 0.0f);
         };
-        auto&& scales = GetAmbiScales(voice->mAmbiScaling);
+        const auto scales = GetAmbiScales(voice->mAmbiScaling);
         auto coeffs = calc_coeffs(Device->mRenderMode);
 
         if(!(coverage > 0.0f))
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp
index 04b88f66..bc25963e 100644
--- a/alc/effects/convolution.cpp
+++ b/alc/effects/convolution.cpp
@@ -93,28 +93,28 @@ void LoadSamples(float *RESTRICT dst, const std::byte *src, const size_t srcstep
 }
 
 
-inline auto& GetAmbiScales(AmbiScaling scaletype) noexcept
+constexpr auto GetAmbiScales(AmbiScaling scaletype) noexcept
 {
     switch(scaletype)
     {
-    case AmbiScaling::FuMa: return AmbiScale::FromFuMa();
-    case AmbiScaling::SN3D: return AmbiScale::FromSN3D();
-    case AmbiScaling::UHJ: return AmbiScale::FromUHJ();
+    case AmbiScaling::FuMa: return al::span{AmbiScale::FromFuMa};
+    case AmbiScaling::SN3D: return al::span{AmbiScale::FromSN3D};
+    case AmbiScaling::UHJ: return al::span{AmbiScale::FromUHJ};
     case AmbiScaling::N3D: break;
     }
-    return AmbiScale::FromN3D();
+    return al::span{AmbiScale::FromN3D};
 }
 
-inline auto& GetAmbiLayout(AmbiLayout layouttype) noexcept
+constexpr auto GetAmbiLayout(AmbiLayout layouttype) noexcept
 {
-    if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa();
-    return AmbiIndex::FromACN();
+    if(layouttype == AmbiLayout::FuMa) return al::span{AmbiIndex::FromFuMa};
+    return al::span{AmbiIndex::FromACN};
 }
 
-inline auto& GetAmbi2DLayout(AmbiLayout layouttype) noexcept
+constexpr auto GetAmbi2DLayout(AmbiLayout layouttype) noexcept
 {
-    if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa2D();
-    return AmbiIndex::FromACN2D();
+    if(layouttype == AmbiLayout::FuMa) return al::span{AmbiIndex::FromFuMa2D};
+    return al::span{AmbiIndex::FromACN2D};
 }
 
 
@@ -453,7 +453,7 @@ void ConvolutionState::update(const ContextBase *context, const EffectSlot *slot
         }
         mOutTarget = target.Main->Buffer;
 
-        auto&& scales = GetAmbiScales(mAmbiScaling);
+        const auto scales = GetAmbiScales(mAmbiScaling);
         const uint8_t *index_map{Is2DAmbisonic(mChannels) ?
             GetAmbi2DLayout(mAmbiLayout).data() :
             GetAmbiLayout(mAmbiLayout).data()};
diff --git a/alc/panning.cpp b/alc/panning.cpp
index 46a840bd..871fef65 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -314,17 +314,17 @@ void InitDistanceComp(ALCdevice *device, const al::span<const Channel> channels,
 }
 
 
-inline auto& GetAmbiScales(DevAmbiScaling scaletype) noexcept
+constexpr auto GetAmbiScales(DevAmbiScaling scaletype) noexcept
 {
-    if(scaletype == DevAmbiScaling::FuMa) return AmbiScale::FromFuMa();
-    if(scaletype == DevAmbiScaling::SN3D) return AmbiScale::FromSN3D();
-    return AmbiScale::FromN3D();
+    if(scaletype == DevAmbiScaling::FuMa) return al::span{AmbiScale::FromFuMa};
+    if(scaletype == DevAmbiScaling::SN3D) return al::span{AmbiScale::FromSN3D};
+    return al::span{AmbiScale::FromN3D};
 }
 
-inline auto& GetAmbiLayout(DevAmbiLayout layouttype) noexcept
+constexpr auto GetAmbiLayout(DevAmbiLayout layouttype) noexcept
 {
-    if(layouttype == DevAmbiLayout::FuMa) return AmbiIndex::FromFuMa();
-    return AmbiIndex::FromACN();
+    if(layouttype == DevAmbiLayout::FuMa) return al::span{AmbiIndex::FromFuMa};
+    return al::span{AmbiIndex::FromACN};
 }
 
 
@@ -355,8 +355,8 @@ DecoderView MakeDecoderView(ALCdevice *device, const AmbDecConf *conf,
 
     const auto num_coeffs = decoder.mIs3D ? AmbiChannelsFromOrder(decoder.mOrder)
         : Ambi2DChannelsFromOrder(decoder.mOrder);
-    const auto idx_map = decoder.mIs3D ? AmbiIndex::FromACN().data()
-        : AmbiIndex::FromACN2D().data();
+    const auto idx_map = decoder.mIs3D ? AmbiIndex::FromACN.data()
+        : AmbiIndex::FromACN2D.data();
     const auto hfmatrix = conf->HFMatrix;
     const auto lfmatrix = conf->LFMatrix;
 
@@ -601,13 +601,13 @@ void InitPanning(ALCdevice *device, const bool hqdec=false, const bool stablize=
         case DevFmtX714: decoder = X714Config; break;
         case DevFmtX3D71: decoder = X3D71Config; break;
         case DevFmtAmbi3D:
-            auto&& acnmap = GetAmbiLayout(device->mAmbiLayout);
-            auto&& n3dscale = GetAmbiScales(device->mAmbiScale);
+            const auto acnmap = GetAmbiLayout(device->mAmbiLayout);
+            const auto n3dscale = GetAmbiScales(device->mAmbiScale);
 
             /* For DevFmtAmbi3D, the ambisonic order is already set. */
             const size_t count{AmbiChannelsFromOrder(device->mAmbiOrder)};
             std::transform(acnmap.begin(), acnmap.begin()+count, std::begin(device->Dry.AmbiMap),
-                [&n3dscale](const uint8_t &acn) noexcept -> BFChannelConfig
+                [n3dscale](const uint8_t &acn) noexcept -> BFChannelConfig
                 { return BFChannelConfig{1.0f/n3dscale[acn], acn}; });
             AllocChannels(device, count, 0);
             device->m2DMixing = false;
@@ -640,8 +640,8 @@ void InitPanning(ALCdevice *device, const bool hqdec=false, const bool stablize=
             continue;
         }
 
-        auto ordermap = decoder.mIs3D ? AmbiIndex::OrderFromChannel().data()
-            : AmbiIndex::OrderFrom2DChannel().data();
+        auto ordermap = decoder.mIs3D ? AmbiIndex::OrderFromChannel.data()
+            : AmbiIndex::OrderFrom2DChannel.data();
 
         chancoeffs.resize(maxz(chancoeffs.size(), idx+1u), ChannelDec{});
         al::span<const float,MaxAmbiChannels> src{decoder.mCoeffs[i]};
@@ -663,11 +663,11 @@ void InitPanning(ALCdevice *device, const bool hqdec=false, const bool stablize=
     device->mAmbiOrder = decoder.mOrder;
     device->m2DMixing = !decoder.mIs3D;
 
-    const al::span<const uint8_t> acnmap{decoder.mIs3D ? AmbiIndex::FromACN().data() :
-        AmbiIndex::FromACN2D().data(), ambicount};
-    auto&& coeffscale = GetAmbiScales(decoder.mScaling);
+    const al::span<const uint8_t> acnmap{decoder.mIs3D ? AmbiIndex::FromACN.data() :
+        AmbiIndex::FromACN2D.data(), ambicount};
+    const auto coeffscale = GetAmbiScales(decoder.mScaling);
     std::transform(acnmap.begin(), acnmap.end(), std::begin(device->Dry.AmbiMap),
-        [&coeffscale](const uint8_t &acn) noexcept
+        [coeffscale](const uint8_t &acn) noexcept
         { return BFChannelConfig{1.0f/coeffscale[acn], acn}; });
     AllocChannels(device, ambicount, device->channelsFromFmt());
 
@@ -902,7 +902,7 @@ void InitHrtfPanning(ALCdevice *device)
     device->m2DMixing = false;
 
     const size_t count{AmbiChannelsFromOrder(ambi_order)};
-    std::transform(AmbiIndex::FromACN().begin(), AmbiIndex::FromACN().begin()+count,
+    std::transform(AmbiIndex::FromACN.begin(), AmbiIndex::FromACN.begin()+count,
         std::begin(device->Dry.AmbiMap),
         [](const uint8_t &index) noexcept { return BFChannelConfig{1.0f, index}; }
     );
@@ -925,10 +925,10 @@ void InitUhjPanning(ALCdevice *device)
     device->mAmbiOrder = 1;
     device->m2DMixing = true;
 
-    auto acnmap_begin = AmbiIndex::FromFuMa2D().begin();
+    auto acnmap_begin = AmbiIndex::FromFuMa2D.begin();
     std::transform(acnmap_begin, acnmap_begin + count, std::begin(device->Dry.AmbiMap),
         [](const uint8_t &acn) noexcept -> BFChannelConfig
-        { return BFChannelConfig{1.0f/AmbiScale::FromUHJ()[acn], acn}; });
+        { return BFChannelConfig{1.0f/AmbiScale::FromUHJ[acn], acn}; });
     AllocChannels(device, count, device->channelsFromFmt());
 }
 
@@ -1155,7 +1155,7 @@ void aluInitEffectPanning(EffectSlot *slot, ALCcontext *context)
 
     slot->mWetBuffer.resize(count);
 
-    auto acnmap_begin = AmbiIndex::FromACN().begin();
+    auto acnmap_begin = AmbiIndex::FromACN.begin();
     auto iter = std::transform(acnmap_begin, acnmap_begin + count, slot->Wet.AmbiMap.begin(),
         [](const uint8_t &acn) noexcept -> BFChannelConfig
         { return BFChannelConfig{1.0f, acn}; });
diff --git a/core/ambidefs.h b/core/ambidefs.h
index 3af26258..bea1a312 100644
--- a/core/ambidefs.h
+++ b/core/ambidefs.h
@@ -48,70 +48,54 @@ inline constexpr size_t MaxAmbi2DChannels{Ambi2DChannelsFromOrder(MaxAmbiOrder)}
  * coefficients should be divided by these values to get proper scalings.
  */
 struct AmbiScale {
-    static auto& FromN3D() noexcept
-    {
-        static constexpr const std::array<float,MaxAmbiChannels> ret{{
-            1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
-            1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f
-        }};
-        return ret;
-    }
-    static auto& FromSN3D() noexcept
-    {
-        static constexpr const std::array<float,MaxAmbiChannels> ret{{
-            1.000000000f, /* ACN  0, sqrt(1) */
-            1.732050808f, /* ACN  1, sqrt(3) */
-            1.732050808f, /* ACN  2, sqrt(3) */
-            1.732050808f, /* ACN  3, sqrt(3) */
-            2.236067978f, /* ACN  4, sqrt(5) */
-            2.236067978f, /* ACN  5, sqrt(5) */
-            2.236067978f, /* ACN  6, sqrt(5) */
-            2.236067978f, /* ACN  7, sqrt(5) */
-            2.236067978f, /* ACN  8, sqrt(5) */
-            2.645751311f, /* ACN  9, sqrt(7) */
-            2.645751311f, /* ACN 10, sqrt(7) */
-            2.645751311f, /* ACN 11, sqrt(7) */
-            2.645751311f, /* ACN 12, sqrt(7) */
-            2.645751311f, /* ACN 13, sqrt(7) */
-            2.645751311f, /* ACN 14, sqrt(7) */
-            2.645751311f, /* ACN 15, sqrt(7) */
-        }};
-        return ret;
-    }
-    static auto& FromFuMa() noexcept
-    {
-        static constexpr const std::array<float,MaxAmbiChannels> ret{{
-            1.414213562f, /* ACN  0 (W), sqrt(2) */
-            1.732050808f, /* ACN  1 (Y), sqrt(3) */
-            1.732050808f, /* ACN  2 (Z), sqrt(3) */
-            1.732050808f, /* ACN  3 (X), sqrt(3) */
-            1.936491673f, /* ACN  4 (V), sqrt(15)/2 */
-            1.936491673f, /* ACN  5 (T), sqrt(15)/2 */
-            2.236067978f, /* ACN  6 (R), sqrt(5) */
-            1.936491673f, /* ACN  7 (S), sqrt(15)/2 */
-            1.936491673f, /* ACN  8 (U), sqrt(15)/2 */
-            2.091650066f, /* ACN  9 (Q), sqrt(35/8) */
-            1.972026594f, /* ACN 10 (O), sqrt(35)/3 */
-            2.231093404f, /* ACN 11 (M), sqrt(224/45) */
-            2.645751311f, /* ACN 12 (K), sqrt(7) */
-            2.231093404f, /* ACN 13 (L), sqrt(224/45) */
-            1.972026594f, /* ACN 14 (N), sqrt(35)/3 */
-            2.091650066f, /* ACN 15 (P), sqrt(35/8) */
-        }};
-        return ret;
-    }
-    static auto& FromUHJ() noexcept
-    {
-        static constexpr const std::array<float,MaxAmbiChannels> ret{{
-            1.000000000f, /* ACN  0 (W), sqrt(1) */
-            1.224744871f, /* ACN  1 (Y), sqrt(3/2) */
-            1.224744871f, /* ACN  2 (Z), sqrt(3/2) */
-            1.224744871f, /* ACN  3 (X), sqrt(3/2) */
-            /* Higher orders not relevant for UHJ. */
-            1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
-        }};
-        return ret;
-    }
+    static inline constexpr std::array<float,MaxAmbiChannels> FromN3D{{
+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f
+    }};
+    static inline constexpr std::array<float,MaxAmbiChannels> FromSN3D{{
+        1.000000000f, /* ACN  0, sqrt(1) */
+        1.732050808f, /* ACN  1, sqrt(3) */
+        1.732050808f, /* ACN  2, sqrt(3) */
+        1.732050808f, /* ACN  3, sqrt(3) */
+        2.236067978f, /* ACN  4, sqrt(5) */
+        2.236067978f, /* ACN  5, sqrt(5) */
+        2.236067978f, /* ACN  6, sqrt(5) */
+        2.236067978f, /* ACN  7, sqrt(5) */
+        2.236067978f, /* ACN  8, sqrt(5) */
+        2.645751311f, /* ACN  9, sqrt(7) */
+        2.645751311f, /* ACN 10, sqrt(7) */
+        2.645751311f, /* ACN 11, sqrt(7) */
+        2.645751311f, /* ACN 12, sqrt(7) */
+        2.645751311f, /* ACN 13, sqrt(7) */
+        2.645751311f, /* ACN 14, sqrt(7) */
+        2.645751311f, /* ACN 15, sqrt(7) */
+    }};
+    static inline constexpr std::array<float,MaxAmbiChannels> FromFuMa{{
+        1.414213562f, /* ACN  0 (W), sqrt(2) */
+        1.732050808f, /* ACN  1 (Y), sqrt(3) */
+        1.732050808f, /* ACN  2 (Z), sqrt(3) */
+        1.732050808f, /* ACN  3 (X), sqrt(3) */
+        1.936491673f, /* ACN  4 (V), sqrt(15)/2 */
+        1.936491673f, /* ACN  5 (T), sqrt(15)/2 */
+        2.236067978f, /* ACN  6 (R), sqrt(5) */
+        1.936491673f, /* ACN  7 (S), sqrt(15)/2 */
+        1.936491673f, /* ACN  8 (U), sqrt(15)/2 */
+        2.091650066f, /* ACN  9 (Q), sqrt(35/8) */
+        1.972026594f, /* ACN 10 (O), sqrt(35)/3 */
+        2.231093404f, /* ACN 11 (M), sqrt(224/45) */
+        2.645751311f, /* ACN 12 (K), sqrt(7) */
+        2.231093404f, /* ACN 13 (L), sqrt(224/45) */
+        1.972026594f, /* ACN 14 (N), sqrt(35)/3 */
+        2.091650066f, /* ACN 15 (P), sqrt(35/8) */
+    }};
+    static inline constexpr std::array<float,MaxAmbiChannels> FromUHJ{{
+        1.000000000f, /* ACN  0 (W), sqrt(1) */
+        1.224744871f, /* ACN  1 (Y), sqrt(3/2) */
+        1.224744871f, /* ACN  2 (Z), sqrt(3/2) */
+        1.224744871f, /* ACN  3 (X), sqrt(3/2) */
+        /* Higher orders not relevant for UHJ. */
+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
+    }};
 
     /* Retrieves per-order HF scaling factors for "upsampling" ambisonic data. */
     static std::array<float,MaxAmbiOrder+1> GetHFOrderScales(const uint src_order,
@@ -127,72 +111,49 @@ struct AmbiScale {
 };
 
 struct AmbiIndex {
-    static auto& FromFuMa() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbiChannels> ret{{
-            0,  /* W */
-            3,  /* X */
-            1,  /* Y */
-            2,  /* Z */
-            6,  /* R */
-            7,  /* S */
-            5,  /* T */
-            8,  /* U */
-            4,  /* V */
-            12, /* K */
-            13, /* L */
-            11, /* M */
-            14, /* N */
-            10, /* O */
-            15, /* P */
-            9,  /* Q */
-        }};
-        return ret;
-    }
-    static auto& FromFuMa2D() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbi2DChannels> ret{{
-            0,  /* W */
-            3,  /* X */
-            1,  /* Y */
-            8,  /* U */
-            4,  /* V */
-            15, /* P */
-            9,  /* Q */
-        }};
-        return ret;
-    }
-
-    static auto& FromACN() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbiChannels> ret{{
-            0,  1,  2,  3,  4,  5,  6,  7,
-            8,  9, 10, 11, 12, 13, 14, 15
-        }};
-        return ret;
-    }
-    static auto& FromACN2D() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbi2DChannels> ret{{
-            0, 1,3, 4,8, 9,15
-        }};
-        return ret;
-    }
-
-    static auto& OrderFromChannel() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbiChannels> ret{{
-            0, 1,1,1, 2,2,2,2,2, 3,3,3,3,3,3,3,
-        }};
-        return ret;
-    }
-    static auto& OrderFrom2DChannel() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbi2DChannels> ret{{
-            0, 1,1, 2,2, 3,3,
-        }};
-        return ret;
-    }
+    static inline constexpr std::array<uint8_t,MaxAmbiChannels> FromFuMa{{
+        0,  /* W */
+        3,  /* X */
+        1,  /* Y */
+        2,  /* Z */
+        6,  /* R */
+        7,  /* S */
+        5,  /* T */
+        8,  /* U */
+        4,  /* V */
+        12, /* K */
+        13, /* L */
+        11, /* M */
+        14, /* N */
+        10, /* O */
+        15, /* P */
+        9,  /* Q */
+    }};
+    static inline constexpr std::array<uint8_t,MaxAmbi2DChannels> FromFuMa2D{{
+        0,  /* W */
+        3,  /* X */
+        1,  /* Y */
+        8,  /* U */
+        4,  /* V */
+        15, /* P */
+        9,  /* Q */
+    }};
+
+    static inline constexpr std::array<uint8_t,MaxAmbiChannels> FromACN{{
+        0,  1,  2,  3,  4,  5,  6,  7,
+        8,  9, 10, 11, 12, 13, 14, 15
+    }};
+    static inline constexpr std::array<uint8_t,MaxAmbi2DChannels> FromACN2D{{
+        0, 1,3, 4,8, 9,15
+    }};
+
+
+    static inline constexpr std::array<uint8_t,MaxAmbiChannels> OrderFromChannel{{
+        0, 1,1,1, 2,2,2,2,2, 3,3,3,3,3,3,3,
+    }};
+    static inline constexpr std::array<uint8_t,MaxAmbi2DChannels> OrderFrom2DChannel{{
+        0, 1,1, 2,2, 3,3,
+    }};
 };
 
 
diff --git a/core/hrtf.cpp b/core/hrtf.cpp
index 7d11ee19..f131e72d 100644
--- a/core/hrtf.cpp
+++ b/core/hrtf.cpp
@@ -289,7 +289,7 @@ void DirectHrtfState::build(const HrtfStore *Hrtf, const uint irSize, const bool
     mChannels[0].mSplitter.init(static_cast<float>(xover_norm));
     for(size_t i{0};i < mChannels.size();++i)
     {
-        const size_t order{AmbiIndex::OrderFromChannel()[i]};
+        const size_t order{AmbiIndex::OrderFromChannel[i]};
         mChannels[i].mSplitter = mChannels[0].mSplitter;
         mChannels[i].mHfScale = AmbiOrderHFGain[order];
     }
diff --git a/core/voice.cpp b/core/voice.cpp
index 65986cd1..92da3e76 100644
--- a/core/voice.cpp
+++ b/core/voice.cpp
@@ -1273,7 +1273,7 @@ void Voice::prepare(DeviceBase *device)
     else if(mAmbiOrder && device->mAmbiOrder > mAmbiOrder)
     {
         const uint8_t *OrderFromChan{Is2DAmbisonic(mFmtChannels) ?
-            AmbiIndex::OrderFrom2DChannel().data() : AmbiIndex::OrderFromChannel().data()};
+            AmbiIndex::OrderFrom2DChannel.data() : AmbiIndex::OrderFromChannel.data()};
         const auto scales = AmbiScale::GetHFOrderScales(mAmbiOrder, device->mAmbiOrder,
             device->m2DMixing);