Merge pull request #11873 from fwcd/fix-analyzer-track-use

AnalyzerThread: Pass `AnalyzerTrack` correctly again
mixxxdj · Aug 27, 2023 · 2e169e1 · 2e169e1
2 parents aa4b9d5 + 884e90a
commit 2e169e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/analyzer/analyzerthread.cpp b/src/analyzer/analyzerthread.cpp
@@ -144,7 +144,7 @@ void AnalyzerThread::doRun() {
         for (auto&& analyzer : m_analyzers) {
             // Make sure not to short-circuit initialize(...)
             if (analyzer.initialize(
-                        m_currentTrack->getTrack(),
+                        *m_currentTrack,
                         audioSource->getSignalInfo().getSampleRate(),
                         audioSource->frameLength())) {
                 processTrack = true;

diff --git a/src/analyzer/analyzertrack.h b/src/analyzer/analyzertrack.h
@@ -12,7 +12,7 @@ class AnalyzerTrack {
         std::optional<bool> useFixedTempo;
     };
 
-    AnalyzerTrack(TrackPointer track, Options options = Options());
+    explicit AnalyzerTrack(TrackPointer track, Options options = Options());
 
     /// Fetches the (not-null) track to be analyzed.
     const TrackPointer& getTrack() const;

diff --git a/src/test/analyserwaveformtest.cpp b/src/test/analyserwaveformtest.cpp
@@ -4,6 +4,7 @@
 #include <QtDebug>
 #include <vector>
 
+#include "analyzer/analyzertrack.h"
 #include "analyzer/analyzerwaveform.h"
 #include "library/dao/analysisdao.h"
 #include "test/mixxxtest.h"
@@ -100,7 +101,7 @@ class AnalyzerWaveformTest : public MixxxTest {
 
 // Basic test to make sure we don't alter the input buffer and don't step out of bounds.
 TEST_F(AnalyzerWaveformTest, canary) {
-    m_aw.initialize(m_pTrack,
+    m_aw.initialize(AnalyzerTrack(m_pTrack),
             m_pTrack->getSampleRate(),
             kBigBufSize / kChannelCount);
     m_aw.processSamples(&m_canaryBigBuf[kCanarySize], kBigBufSize);

diff --git a/src/test/analyzersilence_test.cpp b/src/test/analyzersilence_test.cpp
@@ -4,6 +4,7 @@
 
 #include <vector>
 
+#include "analyzer/analyzertrack.h"
 #include "engine/engine.h"
 #include "test/mixxxtest.h"
 #include "track/track.h"
@@ -37,7 +38,7 @@ class AnalyzerSilenceTest : public MixxxTest {
     }
 
     void analyzeTrack() {
-        analyzerSilence.initialize(pTrack,
+        analyzerSilence.initialize(AnalyzerTrack(pTrack),
                 pTrack->getSampleRate(),
                 kTrackLengthFrames);
         analyzerSilence.processSamples(pTrackSampleData.data(), nTrackSampleDataLength);