New code style refactor

2025-12-20 10:25:43 +00:00 · 2018-12-07 19:17:51 -10:00
parent 2c2c72bfd1
commit 058ea23a00
113 changed files with 23305 additions and 27650 deletions
--- a/lib/audiodev/AudioVoiceEngine.cpp
+++ b/lib/audiodev/AudioVoiceEngine.cpp
@@ -1,156 +1,123 @@
 #include "AudioVoiceEngine.hpp"
 #include <cassert>

-namespace boo
-{
+namespace boo {

-BaseAudioVoiceEngine::~BaseAudioVoiceEngine()
-{
-    m_mainSubmix.reset();
-    assert(m_voiceHead == nullptr && "Dangling voices detected");
-    assert(m_submixHead == nullptr && "Dangling submixes detected");
+BaseAudioVoiceEngine::~BaseAudioVoiceEngine() {
+  m_mainSubmix.reset();
+  assert(m_voiceHead == nullptr && "Dangling voices detected");
+  assert(m_submixHead == nullptr && "Dangling submixes detected");
 }

 template <typename T>
-void BaseAudioVoiceEngine::_pumpAndMixVoices(size_t frames, T* dataOut)
-{
-    if (dataOut)
-        memset(dataOut, 0, sizeof(T) * frames * m_mixInfo.m_channelMap.m_channelCount);
+void BaseAudioVoiceEngine::_pumpAndMixVoices(size_t frames, T* dataOut) {
+  if (dataOut)
+    memset(dataOut, 0, sizeof(T) * frames * m_mixInfo.m_channelMap.m_channelCount);
+
+  if (m_ltRtProcessing) {
+    size_t sampleCount = m_5msFrames * 5;
+    if (_getLtRtIn<T>().size() < sampleCount)
+      _getLtRtIn<T>().resize(sampleCount);
+    m_mainSubmix->_getRedirect<T>() = _getLtRtIn<T>().data();
+  } else {
+    m_mainSubmix->_getRedirect<T>() = dataOut;
+  }
+
+  if (m_submixesDirty) {
+    m_linearizedSubmixes = m_mainSubmix->_linearizeC3();
+    m_submixesDirty = false;
+  }
+
+  size_t remFrames = frames;
+  while (remFrames) {
+    size_t thisFrames;
+    if (remFrames < m_5msFrames) {
+      thisFrames = remFrames;
+      if (m_engineCallback)
+        m_engineCallback->on5MsInterval(*this, thisFrames / double(m_5msFrames) * 5.0 / 1000.0);
+    } else {
+      thisFrames = m_5msFrames;
+      if (m_engineCallback)
+        m_engineCallback->on5MsInterval(*this, 5.0 / 1000.0);
+    }

    if (m_ltRtProcessing)
-    {
-        size_t sampleCount = m_5msFrames * 5;
-        if (_getLtRtIn<T>().size() < sampleCount)
-            _getLtRtIn<T>().resize(sampleCount);
-        m_mainSubmix->_getRedirect<T>() = _getLtRtIn<T>().data();
-    }
-    else
-    {
-        m_mainSubmix->_getRedirect<T>() = dataOut;
+      std::fill(_getLtRtIn<T>().begin(), _getLtRtIn<T>().end(), 0.f);
+
+    for (auto it = m_linearizedSubmixes.rbegin(); it != m_linearizedSubmixes.rend(); ++it)
+      (*it)->_zeroFill<T>();
+
+    if (m_voiceHead)
+      for (AudioVoice& vox : *m_voiceHead)
+        if (vox.m_running)
+          vox.pumpAndMix<T>(thisFrames);
+
+    for (auto it = m_linearizedSubmixes.rbegin(); it != m_linearizedSubmixes.rend(); ++it)
+      (*it)->_pumpAndMix<T>(thisFrames);
+
+    remFrames -= thisFrames;
+    if (!dataOut)
+      continue;
+
+    if (m_ltRtProcessing) {
+      m_ltRtProcessing->Process(_getLtRtIn<T>().data(), dataOut, int(thisFrames));
+      m_mainSubmix->_getRedirect<T>() = _getLtRtIn<T>().data();
    }

-    if (m_submixesDirty)
-    {
-        m_linearizedSubmixes = m_mainSubmix->_linearizeC3();
-        m_submixesDirty = false;
-    }
+    size_t sampleCount = thisFrames * m_mixInfo.m_channelMap.m_channelCount;
+    for (size_t i = 0; i < sampleCount; ++i)
+      dataOut[i] *= m_totalVol;

-    size_t remFrames = frames;
-    while (remFrames)
-    {
-        size_t thisFrames;
-        if (remFrames < m_5msFrames)
-        {
-            thisFrames = remFrames;
-            if (m_engineCallback)
-                m_engineCallback->on5MsInterval(*this, thisFrames / double(m_5msFrames) * 5.0 / 1000.0);
-        }
-        else
-        {
-            thisFrames = m_5msFrames;
-            if (m_engineCallback)
-                m_engineCallback->on5MsInterval(*this, 5.0 / 1000.0);
-        }
+    dataOut += sampleCount;
+  }

-        if (m_ltRtProcessing)
-            std::fill(_getLtRtIn<T>().begin(), _getLtRtIn<T>().end(), 0.f);
-
-        for (auto it = m_linearizedSubmixes.rbegin() ; it != m_linearizedSubmixes.rend() ; ++it)
-            (*it)->_zeroFill<T>();
-
-        if (m_voiceHead)
-            for (AudioVoice& vox : *m_voiceHead)
-                if (vox.m_running)
-                    vox.pumpAndMix<T>(thisFrames);
-
-        for (auto it = m_linearizedSubmixes.rbegin() ; it != m_linearizedSubmixes.rend() ; ++it)
-            (*it)->_pumpAndMix<T>(thisFrames);
-
-        remFrames -= thisFrames;
-        if (!dataOut)
-            continue;
-
-        if (m_ltRtProcessing)
-        {
-            m_ltRtProcessing->Process(_getLtRtIn<T>().data(), dataOut, int(thisFrames));
-            m_mainSubmix->_getRedirect<T>() = _getLtRtIn<T>().data();
-        }
-
-        size_t sampleCount = thisFrames * m_mixInfo.m_channelMap.m_channelCount;
-        for (size_t i=0 ; i<sampleCount ; ++i)
-            dataOut[i] *= m_totalVol;
-
-        dataOut += sampleCount;
-    }
-
-    if (m_engineCallback)
-        m_engineCallback->onPumpCycleComplete(*this);
+  if (m_engineCallback)
+    m_engineCallback->onPumpCycleComplete(*this);
 }

 template void BaseAudioVoiceEngine::_pumpAndMixVoices<int16_t>(size_t frames, int16_t* dataOut);
 template void BaseAudioVoiceEngine::_pumpAndMixVoices<int32_t>(size_t frames, int32_t* dataOut);
 template void BaseAudioVoiceEngine::_pumpAndMixVoices<float>(size_t frames, float* dataOut);

-void BaseAudioVoiceEngine::_resetSampleRate()
-{
-    if (m_voiceHead)
-        for (boo::AudioVoice& vox : *m_voiceHead)
-            vox._resetSampleRate(vox.m_sampleRateIn);
-    if (m_submixHead)
-        for (boo::AudioSubmix& smx : *m_submixHead)
-            smx._resetOutputSampleRate();
+void BaseAudioVoiceEngine::_resetSampleRate() {
+  if (m_voiceHead)
+    for (boo::AudioVoice& vox : *m_voiceHead)
+      vox._resetSampleRate(vox.m_sampleRateIn);
+  if (m_submixHead)
+    for (boo::AudioSubmix& smx : *m_submixHead)
+      smx._resetOutputSampleRate();
 }

-ObjToken<IAudioVoice>
-BaseAudioVoiceEngine::allocateNewMonoVoice(double sampleRate,
-                                           IAudioVoiceCallback* cb,
-                                           bool dynamicPitch)
-{
-    return {new AudioVoiceMono(*this, cb, sampleRate, dynamicPitch)};
+ObjToken<IAudioVoice> BaseAudioVoiceEngine::allocateNewMonoVoice(double sampleRate, IAudioVoiceCallback* cb,
+                                                                 bool dynamicPitch) {
+  return {new AudioVoiceMono(*this, cb, sampleRate, dynamicPitch)};
 }

-ObjToken<IAudioVoice>
-BaseAudioVoiceEngine::allocateNewStereoVoice(double sampleRate,
-                                             IAudioVoiceCallback* cb,
-                                             bool dynamicPitch)
-{
-    return {new AudioVoiceStereo(*this, cb, sampleRate, dynamicPitch)};
+ObjToken<IAudioVoice> BaseAudioVoiceEngine::allocateNewStereoVoice(double sampleRate, IAudioVoiceCallback* cb,
+                                                                   bool dynamicPitch) {
+  return {new AudioVoiceStereo(*this, cb, sampleRate, dynamicPitch)};
 }

-ObjToken<IAudioSubmix>
-BaseAudioVoiceEngine::allocateNewSubmix(bool mainOut, IAudioSubmixCallback* cb, int busId)
-{
-    return {new AudioSubmix(*this, cb, busId, mainOut)};
+ObjToken<IAudioSubmix> BaseAudioVoiceEngine::allocateNewSubmix(bool mainOut, IAudioSubmixCallback* cb, int busId) {
+  return {new AudioSubmix(*this, cb, busId, mainOut)};
 }

-void BaseAudioVoiceEngine::setCallbackInterface(IAudioVoiceEngineCallback* cb)
-{
-    m_engineCallback = cb;
+void BaseAudioVoiceEngine::setCallbackInterface(IAudioVoiceEngineCallback* cb) { m_engineCallback = cb; }
+
+void BaseAudioVoiceEngine::setVolume(float vol) { m_totalVol = vol; }
+
+bool BaseAudioVoiceEngine::enableLtRt(bool enable) {
+  if (enable && m_mixInfo.m_channelMap.m_channelCount == 2 && m_mixInfo.m_channels == AudioChannelSet::Stereo)
+    m_ltRtProcessing = std::make_unique<LtRtProcessing>(m_5msFrames, m_mixInfo);
+  else
+    m_ltRtProcessing.reset();
+  return m_ltRtProcessing.operator bool();
 }

-void BaseAudioVoiceEngine::setVolume(float vol)
-{
-    m_totalVol = vol;
+const AudioVoiceEngineMixInfo& BaseAudioVoiceEngine::mixInfo() const { return m_mixInfo; }
+
+const AudioVoiceEngineMixInfo& BaseAudioVoiceEngine::clientMixInfo() const {
+  return m_ltRtProcessing ? m_ltRtProcessing->inMixInfo() : m_mixInfo;
 }

-bool BaseAudioVoiceEngine::enableLtRt(bool enable)
-{
-    if (enable && m_mixInfo.m_channelMap.m_channelCount == 2 &&
-        m_mixInfo.m_channels == AudioChannelSet::Stereo)
-        m_ltRtProcessing = std::make_unique<LtRtProcessing>(m_5msFrames, m_mixInfo);
-    else
-        m_ltRtProcessing.reset();
-    return m_ltRtProcessing.operator bool();
-}
-
-const AudioVoiceEngineMixInfo& BaseAudioVoiceEngine::mixInfo() const
-{
-    return m_mixInfo;
-}
-
-const AudioVoiceEngineMixInfo& BaseAudioVoiceEngine::clientMixInfo() const
-{
-    return m_ltRtProcessing ? m_ltRtProcessing->inMixInfo() : m_mixInfo;
-}
-
-}
+} // namespace boo