diff options
Diffstat (limited to 'core/voice.cpp')
| -rw-r--r-- | core/voice.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/voice.cpp b/core/voice.cpp index ed6c9bf8..15230726 100644 --- a/core/voice.cpp +++ b/core/voice.cpp @@ -854,13 +854,13 @@ void Voice::prepare(DeviceBase *device) if(mFmtChannels == FmtSuperStereo) { - mDecoder = std::make_unique<UhjStereoDecoder>(); - mDecoderPadding = UhjStereoDecoder::sFilterDelay; + mDecoder = std::make_unique<UhjStereoDecoder<UhjLengthStd>>(); + mDecoderPadding = UhjStereoDecoder<UhjLengthStd>::sFilterDelay; } else if(IsUHJ(mFmtChannels)) { - mDecoder = std::make_unique<UhjDecoder>(); - mDecoderPadding = UhjDecoder::sFilterDelay; + mDecoder = std::make_unique<UhjDecoder<UhjLengthStd>>(); + mDecoderPadding = UhjDecoder<UhjLengthStd>::sFilterDelay; } else { @@ -908,9 +908,9 @@ void Voice::prepare(DeviceBase *device) */ if(mFmtChannels == FmtUHJ2) { - mChans[0].mAmbiLFScale = UhjDecoder::sWLFScale; - mChans[1].mAmbiLFScale = UhjDecoder::sXYLFScale; - mChans[2].mAmbiLFScale = UhjDecoder::sXYLFScale; + mChans[0].mAmbiLFScale = UhjDecoder<UhjLengthStd>::sWLFScale; + mChans[1].mAmbiLFScale = UhjDecoder<UhjLengthStd>::sXYLFScale; + mChans[2].mAmbiLFScale = UhjDecoder<UhjLengthStd>::sXYLFScale; } mFlags.set(VoiceIsAmbisonic); } @@ -930,9 +930,9 @@ void Voice::prepare(DeviceBase *device) chandata.mDryParams.NFCtrlFilter = device->mNFCtrlFilter; std::fill_n(chandata.mWetParams.begin(), device->NumAuxSends, SendParams{}); } - mChans[0].mAmbiLFScale = UhjDecoder::sWLFScale; - mChans[1].mAmbiLFScale = UhjDecoder::sXYLFScale; - mChans[2].mAmbiLFScale = UhjDecoder::sXYLFScale; + mChans[0].mAmbiLFScale = UhjDecoder<UhjLengthStd>::sWLFScale; + mChans[1].mAmbiLFScale = UhjDecoder<UhjLengthStd>::sXYLFScale; + mChans[2].mAmbiLFScale = UhjDecoder<UhjLengthStd>::sXYLFScale; mFlags.set(VoiceIsAmbisonic); } else |