diff options
author | Chris Robinson <[email protected]> | 2019-03-31 22:27:56 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2019-03-31 22:27:56 -0700 |
commit | 0e0e85af72f855627ca043e234949593ff947caf (patch) | |
tree | 4262b2fc2f43e06b52aff0a6563f8aacdc1c626a /Alc/bformatdec.cpp | |
parent | 423333c59455a7cc2ca3cee49e8a4643bc0298c5 (diff) |
Don't bother with a separate reset method for BFormatDec
Diffstat (limited to 'Alc/bformatdec.cpp')
-rw-r--r-- | Alc/bformatdec.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Alc/bformatdec.cpp b/Alc/bformatdec.cpp index fe943d9d..563282a7 100644 --- a/Alc/bformatdec.cpp +++ b/Alc/bformatdec.cpp @@ -49,14 +49,9 @@ inline auto GetAmbiScales(AmbDecScale scaletype) noexcept -> const std::array<fl } // namespace -void BFormatDec::reset(const AmbDecConf *conf, const bool allow_2band, const ALsizei inchans, +BFormatDec::BFormatDec(const AmbDecConf *conf, const bool allow_2band, const ALsizei inchans, const ALuint srate, const ALsizei (&chanmap)[MAX_OUTPUT_CHANNELS]) { - mSamples.clear(); - mSamplesHF = nullptr; - mSamplesLF = nullptr; - - mMatrix = MatrixU{}; mDualBand = allow_2band && (conf->FreqBands == 2); if(!mDualBand) mSamples.resize(2); @@ -124,16 +119,10 @@ void BFormatDec::reset(const AmbDecConf *conf, const bool allow_2band, const ALs } } -void BFormatDec::reset(const ALsizei inchans, const ALsizei chancount, +BFormatDec::BFormatDec(const ALsizei inchans, const ALsizei chancount, const ChannelDec (&chancoeffs)[MAX_OUTPUT_CHANNELS], const ALsizei (&chanmap)[MAX_OUTPUT_CHANNELS]) { - mSamples.clear(); - mSamplesHF = nullptr; - mSamplesLF = nullptr; - - mMatrix = MatrixU{}; - mDualBand = false; mSamples.resize(2); mNumChannels = inchans; |