Use thread safety annotations in EngineSideChain.

2 files changed, 6 insertions, 5 deletions

diff --git a/src/engine/sidechain/enginesidechain.cpp b/src/engine/sidechain/enginesidechain.cpp
index a3b2ba457d..e0f892045d 100644
--- a/src/engine/sidechain/enginesidechain.cpp
+++ b/src/engine/sidechain/enginesidechain.cpp
@@ -59,7 +59,7 @@ EngineSideChain::~EngineSideChain() {
     // Wait until the thread has finished.
     wait();
 
-    QMutexLocker locker(&m_workerLock);
+    MMutexLocker locker(&m_workerLock);
     while (!m_workers.empty()) {
         SideChainWorker* pWorker = m_workers.takeLast();
         pWorker->shutdown();
@@ -71,7 +71,7 @@ EngineSideChain::~EngineSideChain() {
 }
 
 void EngineSideChain::addSideChainWorker(SideChainWorker* pWorker) {
-    QMutexLocker locker(&m_workerLock);
+    MMutexLocker locker(&m_workerLock);
     m_workers.append(pWorker);
 }
 
@@ -110,7 +110,7 @@ void EngineSideChain::run() {
         while ((samples_read = m_sampleFifo.read(m_pWorkBuffer,
                                                  SIDECHAIN_BUFFER_SIZE))) {
             Trace process("EngineSideChain::process");
-            QMutexLocker locker(&m_workerLock);
+            MMutexLocker locker(&m_workerLock);
             foreach (SideChainWorker* pWorker, m_workers) {
                 pWorker->process(m_pWorkBuffer, samples_read);
             }
diff --git a/src/engine/sidechain/enginesidechain.h b/src/engine/sidechain/enginesidechain.h
index af65873f70..72904b3a94 100644
--- a/src/engine/sidechain/enginesidechain.h
+++ b/src/engine/sidechain/enginesidechain.h
@@ -25,6 +25,7 @@
 #include "preferences/usersettings.h"
 #include "engine/sidechain/sidechainworker.h"
 #include "util/fifo.h"
+#include "util/mutex.h"
 #include "util/types.h"
 
 class EngineSideChain : public QThread {
@@ -57,8 +58,8 @@ class EngineSideChain : public QThread {
     QWaitCondition m_waitForSamples;
 
     // Sidechain workers registered with EngineSideChain.
-    QMutex m_workerLock;
-    QList<SideChainWorker*> m_workers;
+    MMutex m_workerLock;
+    QList<SideChainWorker*> m_workers GUARDED_BY(m_workerLock);
 };
 
 #endif