diff options
author | Chris Robinson <[email protected]> | 2022-08-15 12:56:36 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2022-08-15 12:56:36 -0700 |
commit | 82c5b741e5c7448eb2649e33505622e42e08794e (patch) | |
tree | 70113c84ceb57c68b58bc02d99f372f223bda26b /core | |
parent | f9e6fbaeff2761d90bfd572acb52f9acebf5ea7b (diff) |
Use proper array sizes for more gains
Diffstat (limited to 'core')
-rw-r--r-- | core/mixer.cpp | 2 | ||||
-rw-r--r-- | core/mixer.h | 2 | ||||
-rw-r--r-- | core/voice.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/mixer.cpp b/core/mixer.cpp index 4618406b..3c98ed5e 100644 --- a/core/mixer.cpp +++ b/core/mixer.cpp @@ -114,7 +114,7 @@ std::array<float,MaxAmbiChannels> CalcAmbiCoeffs(const float y, const float z, c } void ComputePanGains(const MixParams *mix, const float*RESTRICT coeffs, const float ingain, - const al::span<float,MAX_OUTPUT_CHANNELS> gains) + const al::span<float,MaxAmbiChannels> gains) { auto ambimap = mix->AmbiMap.cbegin(); diff --git a/core/mixer.h b/core/mixer.h index 309f4224..b819b3c7 100644 --- a/core/mixer.h +++ b/core/mixer.h @@ -78,7 +78,7 @@ inline std::array<float,MaxAmbiChannels> CalcAngleCoeffs(const float azimuth, * scale and orient the sound samples. */ void ComputePanGains(const MixParams *mix, const float*RESTRICT coeffs, const float ingain, - const al::span<float,MAX_OUTPUT_CHANNELS> gains); + const al::span<float,MaxAmbiChannels> gains); /** Helper to set an identity/pass-through panning for ambisonic mixing (3D input). */ diff --git a/core/voice.h b/core/voice.h index 42ad7704..9dd642b4 100644 --- a/core/voice.h +++ b/core/voice.h @@ -85,8 +85,8 @@ struct SendParams { BiquadFilter HighPass; struct { - std::array<float,MAX_OUTPUT_CHANNELS> Current; - std::array<float,MAX_OUTPUT_CHANNELS> Target; + std::array<float,MaxAmbiChannels> Current; + std::array<float,MaxAmbiChannels> Target; } Gains; }; |