From 000f93140c189fd3d7590736dd51864e044e0257 Mon Sep 17 00:00:00 2001 From: Uwe Klotz Date: Tue, 4 Jun 2019 17:56:06 +0200 Subject: [PATCH] Remove obsolete mutex from AnalyzerQueenMaryKey --- src/analyzer/plugins/analyzerqueenmarykey.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/analyzer/plugins/analyzerqueenmarykey.cpp b/src/analyzer/plugins/analyzerqueenmarykey.cpp index 02d457426a0..ed0b3c290bf 100644 --- a/src/analyzer/plugins/analyzerqueenmarykey.cpp +++ b/src/analyzer/plugins/analyzerqueenmarykey.cpp @@ -1,7 +1,5 @@ #include -#include - // Class header comes after library includes here since our preprocessor // definitions interfere with qm-dsp's headers. #include "analyzer/plugins/analyzerqueenmarykey.h" @@ -21,12 +19,6 @@ constexpr int kChromaWindowLength = 10; // Tuning frequency of concert A in Hertz. Default value from VAMP plugin. constexpr int kTuningFrequencyHertz = 440; -// NOTE(2019-01-26, uklotzde) Temporary workaround until multi-threading -// issues when using the qm-dsp key detector have been solved. Synchronizes -// all invocations of initialize()/process()/finalize(). -// See also: https://bugs.launchpad.net/mixxx/+bug/1813413 -QMutex s_mutex; - } // namespace AnalyzerQueenMaryKey::AnalyzerQueenMaryKey() @@ -45,7 +37,6 @@ bool AnalyzerQueenMaryKey::initialize(int samplerate) { size_t windowSize = m_pKeyMode->getBlockSize(); size_t stepSize = m_pKeyMode->getHopSize(); - QMutexLocker locked(&s_mutex); return m_helper.initialize( windowSize, stepSize, [this](double* pWindow, size_t) { int iKey = m_pKeyMode->process(pWindow); @@ -75,13 +66,11 @@ bool AnalyzerQueenMaryKey::process(const CSAMPLE* pIn, const int iLen) { const size_t numInputFrames = iLen / kAnalysisChannels; m_currentFrame += numInputFrames; - QMutexLocker locked(&s_mutex); return m_helper.processStereoSamples(pIn, iLen); } bool AnalyzerQueenMaryKey::finalize() { // TODO(rryan) do we need a flush? - QMutexLocker locked(&s_mutex); m_helper.finalize(); m_pKeyMode.reset(); return true;