From 593170cefe2fa483c697475e9ca58c2e251d864e Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 15 Jan 2017 22:39:56 -1000 Subject: [PATCH] Support nullptr for submix sends --- lib/audiodev/AudioVoice.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/audiodev/AudioVoice.cpp b/lib/audiodev/AudioVoice.cpp index fd3364d..d0126f5 100644 --- a/lib/audiodev/AudioVoice.cpp +++ b/lib/audiodev/AudioVoice.cpp @@ -242,6 +242,9 @@ void AudioVoiceMono::resetChannelLevels() void AudioVoiceMono::setMonoChannelLevels(IAudioSubmix* submix, const float coefs[8], bool slew) { + if (!submix) + submix = &m_root.m_mainSubmix; + auto search = m_sendMatrices.find(submix); if (search == m_sendMatrices.cend()) search = m_sendMatrices.emplace(submix, AudioMatrixMono{}).first; @@ -262,6 +265,9 @@ void AudioVoiceMono::setStereoChannelLevels(IAudioSubmix* submix, const float co coefs[7][0] }; + if (!submix) + submix = &m_root.m_mainSubmix; + auto search = m_sendMatrices.find(submix); if (search == m_sendMatrices.cend()) search = m_sendMatrices.emplace(submix, AudioMatrixMono{}).first; @@ -455,6 +461,9 @@ void AudioVoiceStereo::setMonoChannelLevels(IAudioSubmix* submix, const float co {coefs[7], coefs[7]} }; + if (!submix) + submix = &m_root.m_mainSubmix; + auto search = m_sendMatrices.find(submix); if (search == m_sendMatrices.cend()) search = m_sendMatrices.emplace(submix, AudioMatrixStereo{}).first; @@ -463,6 +472,9 @@ void AudioVoiceStereo::setMonoChannelLevels(IAudioSubmix* submix, const float co void AudioVoiceStereo::setStereoChannelLevels(IAudioSubmix* submix, const float coefs[8][2], bool slew) { + if (!submix) + submix = &m_root.m_mainSubmix; + auto search = m_sendMatrices.find(submix); if (search == m_sendMatrices.cend()) search = m_sendMatrices.emplace(submix, AudioMatrixStereo{}).first;