From 0e0e85af72f855627ca043e234949593ff947caf Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 31 Mar 2019 22:27:56 -0700 Subject: Don't bother with a separate reset method for BFormatDec --- Alc/bformatdec.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'Alc/bformatdec.cpp') 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::arrayFreqBands == 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; -- cgit v1.2.3