aboutsummaryrefslogtreecommitdiffstats
path: root/alc/panning.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2023-12-08 10:11:08 -0800
committerChris Robinson <[email protected]>2023-12-08 10:11:08 -0800
commit040c172cdf186c9ccfb0642aa9ac598f115bb46b (patch)
tree0aaefde29bb9151042933f97f914946e007047e7 /alc/panning.cpp
parent4527b873788373edb630046b0ab586255aa15e44 (diff)
Clean up some more clang-tidy warnings
Diffstat (limited to 'alc/panning.cpp')
-rw-r--r--alc/panning.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/alc/panning.cpp b/alc/panning.cpp
index b512a42a..93ebee73 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -249,7 +249,7 @@ void InitNearFieldCtrl(ALCdevice *device, float ctrl_dist, uint order, bool is3d
}
void InitDistanceComp(ALCdevice *device, const al::span<const Channel> channels,
- const al::span<const float,MAX_OUTPUT_CHANNELS> dists)
+ const al::span<const float,MaxOutputChannels> dists)
{
const float maxdist{std::accumulate(std::begin(dists), std::end(dists), 0.0f, maxf)};
@@ -329,7 +329,7 @@ constexpr auto GetAmbiLayout(DevAmbiLayout layouttype) noexcept
DecoderView MakeDecoderView(ALCdevice *device, const AmbDecConf *conf,
- DecoderConfig<DualBand, MAX_OUTPUT_CHANNELS> &decoder)
+ DecoderConfig<DualBand,MaxOutputChannels> &decoder)
{
DecoderView ret{};
@@ -969,9 +969,9 @@ void aluInitRenderer(ALCdevice *device, int hrtf_id, std::optional<StereoEncodin
break;
}
- std::unique_ptr<DecoderConfig<DualBand,MAX_OUTPUT_CHANNELS>> decoder_store;
+ std::unique_ptr<DecoderConfig<DualBand,MaxOutputChannels>> decoder_store;
DecoderView decoder{};
- float speakerdists[MAX_OUTPUT_CHANNELS]{};
+ std::array<float,MaxOutputChannels> speakerdists{};
auto load_config = [device,&decoder_store,&decoder,&speakerdists](const char *config)
{
AmbDecConf conf{};
@@ -981,10 +981,10 @@ void aluInitRenderer(ALCdevice *device, int hrtf_id, std::optional<StereoEncodin
ERR(" %s\n", err->c_str());
return false;
}
- else if(conf.NumSpeakers > MAX_OUTPUT_CHANNELS)
+ else if(conf.NumSpeakers > MaxOutputChannels)
{
- ERR("Unsupported decoder speaker count %zu (max %d)\n", conf.NumSpeakers,
- MAX_OUTPUT_CHANNELS);
+ ERR("Unsupported decoder speaker count %zu (max %zu)\n", conf.NumSpeakers,
+ MaxOutputChannels);
return false;
}
else if(conf.ChanMask > Ambi3OrderMask)
@@ -998,7 +998,7 @@ void aluInitRenderer(ALCdevice *device, int hrtf_id, std::optional<StereoEncodin
conf.Description.c_str());
device->mXOverFreq = clampf(conf.XOverFreq, 100.0f, 1000.0f);
- decoder_store = std::make_unique<DecoderConfig<DualBand,MAX_OUTPUT_CHANNELS>>();
+ decoder_store = std::make_unique<DecoderConfig<DualBand,MaxOutputChannels>>();
decoder = MakeDecoderView(device, &conf, *decoder_store);
for(size_t i{0};i < decoder.mChannels.size();++i)
speakerdists[i] = conf.Speakers[i].Distance;