Fix destruction order in EngineMixer::~EngineMixer

Author: daschuer

src/engine/enginemixer.cpp

@@ -209,6 +209,16 @@ EngineMixer::EngineMixer(
 
 EngineMixer::~EngineMixer() {
     // qDebug() << "in ~EngineMixer()";
+
+    for (int i = 0; i < m_channels.size(); ++i) {
+        ChannelInfo* pChannelInfo = m_channels[i];
+        delete pChannelInfo->m_pChannel;
+        delete pChannelInfo->m_pVolumeControl;
+        delete pChannelInfo->m_pMuteControl;
+        delete pChannelInfo;
+    }
+    delete m_pWorkerScheduler;
+
     delete m_pKeylockEngine;
     delete m_pCrossfader;
     delete m_pBalance;
@@ -242,16 +252,6 @@ EngineMixer::~EngineMixer() {
     delete m_pMainMonoMixdown;
     delete m_pMicMonitorMode;
     delete m_pHeadphoneEnabled;
-
-    delete m_pWorkerScheduler;
-
-    for (int i = 0; i < m_channels.size(); ++i) {
-        ChannelInfo* pChannelInfo = m_channels[i];
-        delete pChannelInfo->m_pChannel;
-        delete pChannelInfo->m_pVolumeControl;
-        delete pChannelInfo->m_pMuteControl;
-        delete pChannelInfo;
-    }
 }
 
 const CSAMPLE* EngineMixer::getMainBuffer() const {

src/engine/enginemixer.h

@@ -288,36 +288,46 @@ class EngineMixer : public QObject, public AudioSource {
     mixxx::SampleBuffer m_talkoverHeadphones;
     mixxx::SampleBuffer m_sidechainMix;
 
-    EngineWorkerScheduler* m_pWorkerScheduler;
-    EngineSync* m_pEngineSync;
-
-    ControlObject* m_pMainGain;
-    ControlObject* m_pBoothGain;
-    ControlObject* m_pHeadGain;
     ControlObject* m_pSampleRate;
     ControlObject* m_pOutputLatencyMs;
     ControlObject* m_pAudioLatencyOverloadCount;
     ControlObject* m_pAudioLatencyUsage;
     ControlObject* m_pAudioLatencyOverload;
-    EngineTalkoverDucking* m_pTalkoverDucking;
+
+    EngineSync* m_pEngineSync;
+
+    ControlPotmeter* m_pCrossfader;
+    ControlPotmeter* m_pBalance;
+    ControlObject* m_pMainGain;
+    ControlObject* m_pBoothGain;
+
+    EngineVuMeter* m_pVumeter;
+
     EngineDelay* m_pMainDelay;
     EngineDelay* m_pHeadDelay;
     EngineDelay* m_pBoothDelay;
     EngineDelay* m_pLatencyCompensationDelay;
 
-    EngineVuMeter* m_pVumeter;
+    ControlObject* m_pHeadGain;
+    ControlPotmeter* m_pHeadMix;
+    ControlPushButton* m_pHeadSplitEnabled;
+
+    EngineTalkoverDucking* m_pTalkoverDucking;
+
     EngineSideChain* m_pEngineSideChain;
 
-    ControlPotmeter* m_pCrossfader;
-    ControlPotmeter* m_pHeadMix;
-    ControlPotmeter* m_pBalance;
     ControlPushButton* m_pXFaderMode;
     ControlPotmeter* m_pXFaderCurve;
     ControlPotmeter* m_pXFaderCalibration;
     ControlPushButton* m_pXFaderReverse;
-    ControlPushButton* m_pHeadSplitEnabled;
+
     ControlObject* m_pKeylockEngine;
 
+    // Mix two Mono channels. This is useful for outdoor gigs
+    ControlObject* m_pMainMonoMixdown;
+
+    EngineWorkerScheduler* m_pWorkerScheduler;
+
     PflGainCalculator m_headphoneGain;
     TalkoverGainCalculator m_talkoverGain;
     OrientationVolumeGainCalculator m_mainGain;
@@ -337,8 +347,6 @@ class EngineMixer : public QObject, public AudioSource {
     const ChannelHandleAndGroup m_busCrossfaderCenterHandle;
     const ChannelHandleAndGroup m_busCrossfaderRightHandle;
 
-    // Mix two Mono channels. This is useful for outdoor gigs
-    ControlObject* m_pMainMonoMixdown;
     ControlObject* m_pMicMonitorMode;
 
     volatile bool m_bBusOutputConnected[3];

src/test/signalpathtest.h

@@ -135,9 +135,7 @@ class BaseSignalPathTest : public MixxxTest, SoundSourceProviderRegistration {
                 [](PlayerInfo*) { PlayerInfo::destroy(); });
     }
 
-    ~BaseSignalPathTest() override {
-        PlayerInfo::destroy();
-    }
+    ~BaseSignalPathTest() override = default;
 
     void addDeck(EngineDeck* pDeck) {
         ControlObject::set(ConfigKey(pDeck->getGroup(), "main_mix"), 1.0);