diff options
| -rw-r--r-- | alc/alu.cpp | 2 | ||||
| -rw-r--r-- | alc/bformatdec.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/convolution.cpp | 2 | ||||
| -rw-r--r-- | alc/panning.cpp | 4 | ||||
| -rw-r--r-- | core/ambidefs.cpp | 2 | ||||
| -rw-r--r-- | core/ambidefs.h | 2 |
6 files changed, 8 insertions, 8 deletions
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}; } ); diff --git a/core/ambidefs.cpp b/core/ambidefs.cpp index ab36d50b..e032830f 100644 --- a/core/ambidefs.cpp +++ b/core/ambidefs.cpp @@ -10,6 +10,6 @@ constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromFuMa; constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromFuMa; constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromFuMa2D; constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromACN; -constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::From2D; +constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromACN2D; constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::OrderFromChannel; constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::OrderFrom2DChannel; diff --git a/core/ambidefs.h b/core/ambidefs.h index 05e3f5c8..ed8c27fb 100644 --- a/core/ambidefs.h +++ b/core/ambidefs.h @@ -120,7 +120,7 @@ struct AmbiIndex { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }}; - static constexpr std::array<uint8_t,MaxAmbi2DChannels> From2D{{ + static constexpr std::array<uint8_t,MaxAmbi2DChannels> FromACN2D{{ 0, 1,3, 4,8, 9,15 }}; |