diff options
| author | Chris Robinson <chris.kcat@gmail.com> | 2018-12-15 02:42:04 -0800 |
|---|---|---|
| committer | Chris Robinson <chris.kcat@gmail.com> | 2018-12-15 02:56:19 -0800 |
| commit | 0dd13a9dfed47660946fa9d37a1fc35e44b73687 (patch) | |
| tree | d2a0644a466ee0c3def10c8af725451ce6e902c7 /Alc/bformatdec.cpp | |
| parent | 640c06c292632f2ac78d349b0ad3b8b5f000c61a (diff) | |
Make the AmbDec speaker and matrix arrays dynamic
Diffstat (limited to 'Alc/bformatdec.cpp')
| -rw-r--r-- | Alc/bformatdec.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Alc/bformatdec.cpp b/Alc/bformatdec.cpp index 882184a3..d92c84db 100644 --- a/Alc/bformatdec.cpp +++ b/Alc/bformatdec.cpp @@ -91,7 +91,7 @@ void BFormatDec::reset(const AmbDecConf *conf, ALsizei chancount, ALuint srate, mSamplesHF = mSamples.data(); mSamplesLF = mSamplesHF + chancount; - mEnabled = std::accumulate(std::begin(chanmap), std::begin(chanmap)+conf->NumSpeakers, 0u, + mEnabled = std::accumulate(std::begin(chanmap), std::begin(chanmap)+conf->Speakers.size(), 0u, [](ALuint mask, const ALsizei &chan) noexcept -> ALuint { return mask | (1 << chan); } ); @@ -139,7 +139,7 @@ void BFormatDec::reset(const AmbDecConf *conf, ALsizei chancount, ALuint srate, mDualBand = (conf->FreqBands == 2); if(!mDualBand) { - for(ALsizei i{0};i < conf->NumSpeakers;i++) + for(size_t i{0u};i < conf->Speakers.size();i++) { ALfloat (&mtx)[MAX_AMBI_COEFFS] = mMatrix.Single[chanmap[i]]; for(ALsizei j{0},k{0};j < coeff_count;j++) @@ -160,7 +160,7 @@ void BFormatDec::reset(const AmbDecConf *conf, ALsizei chancount, ALuint srate, std::fill(std::begin(mXOver)+1, std::end(mXOver), mXOver[0]); const float ratio{std::pow(10.0f, conf->XOverRatio / 40.0f)}; - for(ALsizei i{0};i < conf->NumSpeakers;i++) + for(size_t i{0u};i < conf->Speakers.size();i++) { ALfloat (&mtx)[sNumBands][MAX_AMBI_COEFFS] = mMatrix.Dual[chanmap[i]]; for(ALsizei j{0},k{0};j < coeff_count;j++) |