From 204f7d88116a3d07f45c19d9a61c676ebf8d54c6 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 25 Dec 2020 06:40:13 -0800
Subject: Rename From2D to FromACN2D

---
 alc/alu.cpp                 | 2 +-
 alc/bformatdec.cpp          | 4 ++--
 alc/effects/convolution.cpp | 2 +-
 alc/panning.cpp             | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'alc')

diff --git a/alc/alu.cpp b/alc/alu.cpp
index 6ecafd09..f3a950f6 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -361,7 +361,7 @@ auto GetAmbiLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,M
 auto GetAmbi2DLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,MaxAmbi2DChannels>&
 {
     if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa2D;
-    return AmbiIndex::From2D;
+    return AmbiIndex::FromACN2D;
 }
 
 
diff --git a/alc/bformatdec.cpp b/alc/bformatdec.cpp
index b1bd8981..0aa65af8 100644
--- a/alc/bformatdec.cpp
+++ b/alc/bformatdec.cpp
@@ -62,7 +62,7 @@ BFormatDec::BFormatDec(const AmbDecConf *conf, const bool allow_2band, const siz
     {
         for(size_t j{0},k{0};j < mChannelDec.size();++j)
         {
-            const size_t acn{periphonic ? j : AmbiIndex::From2D[j]};
+            const size_t acn{periphonic ? j : AmbiIndex::FromACN2D[j]};
             if(!(conf->ChanMask&(1u<<acn))) continue;
             const size_t order{AmbiIndex::OrderFromChannel[acn]};
             const float gain{conf->HFOrderGain[order] / coeff_scale[acn]};
@@ -83,7 +83,7 @@ BFormatDec::BFormatDec(const AmbDecConf *conf, const bool allow_2band, const siz
         const float ratio{std::pow(10.0f, conf->XOverRatio / 40.0f)};
         for(size_t j{0},k{0};j < mChannelDec.size();++j)
         {
-            const size_t acn{periphonic ? j : AmbiIndex::From2D[j]};
+            const size_t acn{periphonic ? j : AmbiIndex::FromACN2D[j]};
             if(!(conf->ChanMask&(1u<<acn))) continue;
             const size_t order{AmbiIndex::OrderFromChannel[acn]};
             const float hfGain{conf->HFOrderGain[order] * ratio / coeff_scale[acn]};
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp
index d0e203c5..948966b4 100644
--- a/alc/effects/convolution.cpp
+++ b/alc/effects/convolution.cpp
@@ -89,7 +89,7 @@ auto GetAmbiLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,M
 auto GetAmbi2DLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,MaxAmbi2DChannels>&
 {
     if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa2D;
-    return AmbiIndex::From2D;
+    return AmbiIndex::FromACN2D;
 }
 
 
diff --git a/alc/panning.cpp b/alc/panning.cpp
index 456f6bef..515dbfcf 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -547,7 +547,7 @@ void InitPanning(ALCdevice *device, const bool hqdec=false, const bool stablize=
 
         /* Built-in speaker decoders are always 2D. */
         const size_t ambicount{Ambi2DChannelsFromOrder(decoder.mOrder)};
-        std::transform(AmbiIndex::From2D.begin(), AmbiIndex::From2D.begin()+ambicount,
+        std::transform(AmbiIndex::FromACN2D.begin(), AmbiIndex::FromACN2D.begin()+ambicount,
             std::begin(device->Dry.AmbiMap),
             [](const uint8_t &index) noexcept { return BFChannelConfig{1.0f, index}; }
         );
@@ -611,7 +611,7 @@ void InitCustomPanning(ALCdevice *device, const bool hqdec, const bool stablize,
     else
     {
         count = Ambi2DChannelsFromOrder(order);
-        std::transform(AmbiIndex::From2D.begin(), AmbiIndex::From2D.begin()+count,
+        std::transform(AmbiIndex::FromACN2D.begin(), AmbiIndex::FromACN2D.begin()+count,
             std::begin(device->Dry.AmbiMap),
             [](const uint8_t &index) noexcept { return BFChannelConfig{1.0f, index}; }
         );
-- 
cgit v1.2.3