Make supported stem constant global

mixxxdj · Jul 7, 2024 · 1b5d009 · 1b5d009
1 parent 74426be
commit 1b5d009
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/analyzer/analyzerwaveform.h b/src/analyzer/analyzerwaveform.h
@@ -15,9 +15,6 @@
 class QImage;
 #endif
 
-namespace {
-constexpr int kMaxSupportedStem = 4;
-}
 
 class EngineFilterIIRBase;
 class QSqlDatabase;
@@ -145,7 +142,7 @@ struct WaveformStride {
 
     float m_overallData[ChannelCount];
     float m_filteredData[ChannelCount][FilterCount];
-    float m_stemData[ChannelCount][kMaxSupportedStem];
+    float m_stemData[ChannelCount][mixxx::kMaxSupportedStem];
 
     float m_averageOverallData[ChannelCount];
     float m_averageFilteredData[ChannelCount][FilterCount];

diff --git a/src/analyzer/constants.h b/src/analyzer/constants.h
@@ -10,6 +10,7 @@ namespace mixxx {
 // fixed number of channels like the engine does, usually 2 = stereo.
 constexpr audio::ChannelCount kAnalysisChannels = mixxx::kEngineChannelOutputCount;
 constexpr audio::ChannelCount kAnalysisMaxChannels = mixxx::kMaxEngineChannelInputCount;
+constexpr int kMaxSupportedStem = 4;
 constexpr SINT kAnalysisFramesPerChunk = 4096;
 constexpr SINT kAnalysisSamplesPerChunk =
         kAnalysisFramesPerChunk * kAnalysisMaxChannels;

diff --git a/src/waveform/waveform.h b/src/waveform/waveform.h
@@ -7,6 +7,7 @@
 #include <QString>
 #include <vector>
 
+#include "analyzer/constants.h"
 #include "audio/signalinfo.h"
 #include "util/class.h"
 #include "util/compatibility/qmutex.h"
@@ -21,7 +22,7 @@ struct WaveformData {
         unsigned char high;
         unsigned char all;
     } filtered;
-    unsigned char stems[4];
+    unsigned char stems[mixxx::kMaxSupportedStem];
 };
 
 class Waveform {