summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/analyzer/analyzer.h12
-rw-r--r--src/analyzer/analyzerbeats.cpp6
-rw-r--r--src/analyzer/analyzerbeats.h4
-rw-r--r--src/analyzer/analyzerebur128.cpp12
-rw-r--r--src/analyzer/analyzerebur128.h4
-rw-r--r--src/analyzer/analyzergain.cpp4
-rw-r--r--src/analyzer/analyzergain.h4
-rw-r--r--src/analyzer/analyzerkey.cpp6
-rw-r--r--src/analyzer/analyzerkey.h4
-rw-r--r--src/analyzer/analyzersilence.cpp4
-rw-r--r--src/analyzer/analyzersilence.h4
-rw-r--r--src/analyzer/analyzerthread.cpp2
-rw-r--r--src/analyzer/analyzerwaveform.cpp4
-rw-r--r--src/analyzer/analyzerwaveform.h4
-rw-r--r--src/analyzer/plugins/analyzerplugin.h11
-rw-r--r--src/analyzer/plugins/analyzerqueenmarybeats.cpp20
-rw-r--r--src/analyzer/plugins/analyzerqueenmarybeats.h10
-rw-r--r--src/analyzer/plugins/analyzerqueenmarykey.cpp2
-rw-r--r--src/analyzer/plugins/analyzerqueenmarykey.h2
-rw-r--r--src/analyzer/plugins/analyzersoundtouchbeats.cpp13
-rw-r--r--src/analyzer/plugins/analyzersoundtouchbeats.h12
21 files changed, 74 insertions, 70 deletions
diff --git a/src/analyzer/analyzer.h b/src/analyzer/analyzer.h
index a9ecd0de07..85d460b8a5 100644
--- a/src/analyzer/analyzer.h
+++ b/src/analyzer/analyzer.h
@@ -32,14 +32,16 @@ class Analyzer {
// If processing fails the analysis can be aborted early by returning
// false. After aborting the analysis only cleanup() will be invoked,
// but not finalize()!
- virtual bool process(const CSAMPLE* pIn, const int iLen) = 0;
+ virtual bool processSamples(const CSAMPLE* pIn, const int iLen) = 0;
// Update the track object with the analysis results after
// processing finished successfully, i.e. all available audio
// samples have been processed.
- virtual void finalize(TrackPointer tio) = 0;
+ virtual void storeResults(TrackPointer tio) = 0;
// Discard any temporary results or free allocated memory.
+ // This function will be invoked after the results have been
+ // stored or if processing aborted preliminary.
virtual void cleanup() = 0;
};
@@ -69,9 +71,9 @@ class AnalyzerWithState final {
return m_active = m_analyzer->initialize(tio, sampleRate, totalSamples);
}
- void process(const CSAMPLE* pIn, const int iLen) {
+ void processSamples(const CSAMPLE* pIn, const int iLen) {
if (m_active) {
- m_active = m_analyzer->process(pIn, iLen);
+ m_active = m_analyzer->processSamples(pIn, iLen);
if (!m_active) {
// Ensure that cleanup() is invoked after processing
// failed and the analyzer became inactive!
@@ -82,7 +84,7 @@ class AnalyzerWithState final {
void finish(TrackPointer tio) {
if (m_active) {
- m_analyzer->finalize(tio);
+ m_analyzer->storeResults(tio);
m_analyzer->cleanup();
m_active = false;
}
diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp
index 53b18fe2a3..b94a037377 100644
--- a/src/analyzer/analyzerbeats.cpp
+++ b/src/analyzer/analyzerbeats.cpp
@@ -172,7 +172,7 @@ bool AnalyzerBeats::shouldAnalyze(TrackPointer tio) const {
return true;
}
-bool AnalyzerBeats::process(const CSAMPLE *pIn, const int iLen) {
+bool AnalyzerBeats::processSamples(const CSAMPLE *pIn, const int iLen) {
VERIFY_OR_DEBUG_ASSERT(m_pPlugin) {
return false;
}
@@ -182,14 +182,14 @@ bool AnalyzerBeats::process(const CSAMPLE *pIn, const int iLen) {
return true; // silently ignore all remaining samples
}
- return m_pPlugin->process(pIn, iLen);
+ return m_pPlugin->processSamples(pIn, iLen);
}
void AnalyzerBeats::cleanup() {
m_pPlugin.reset();
}
-void AnalyzerBeats::finalize(TrackPointer tio) {
+void AnalyzerBeats::storeResults(TrackPointer tio) {
VERIFY_OR_DEBUG_ASSERT(m_pPlugin) {
return;
}
diff --git a/src/analyzer/analyzerbeats.h b/src/analyzer/analyzerbeats.h
index 6e09034799..55c9418f66 100644
--- a/src/analyzer/analyzerbeats.h
+++ b/src/analyzer/analyzerbeats.h
@@ -27,8 +27,8 @@ class AnalyzerBeats : public Analyzer {
static QList<mixxx::AnalyzerPluginInfo> availablePlugins();
bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
- bool process(const CSAMPLE *pIn, const int iLen) override;
- void finalize(TrackPointer tio) override;
+ bool processSamples(const CSAMPLE *pIn, const int iLen) override;
+ void storeResults(TrackPointer tio) override;
void cleanup() override;
private:
diff --git a/src/analyzer/analyzerebur128.cpp b/src/analyzer/analyzerebur128.cpp
index df06208fbf..8f022b846e 100644
--- a/src/analyzer/analyzerebur128.cpp
+++ b/src/analyzer/analyzerebur128.cpp
@@ -42,32 +42,32 @@ void AnalyzerEbur128::cleanup() {
}
}
-bool AnalyzerEbur128::process(const CSAMPLE *pIn, const int iLen) {
+bool AnalyzerEbur128::processSamples(const CSAMPLE *pIn, const int iLen) {
VERIFY_OR_DEBUG_ASSERT(m_pState) {
return false;
}
- ScopedTimer t("AnalyzerEbur128::process()");
+ ScopedTimer t("AnalyzerEbur128::processSamples()");
size_t frames = iLen / 2;
int e = ebur128_add_frames_float(m_pState, pIn, frames);
VERIFY_OR_DEBUG_ASSERT(e == EBUR128_SUCCESS) {
- qWarning() << "AnalyzerEbur128::process() failed with" << e;
+ qWarning() << "AnalyzerEbur128::processSamples() failed with" << e;
return false;
}
return true;
}
-void AnalyzerEbur128::finalize(TrackPointer tio) {
+void AnalyzerEbur128::storeResults(TrackPointer tio) {
VERIFY_OR_DEBUG_ASSERT(m_pState) {
return;
}
double averageLufs;
int e = ebur128_loudness_global(m_pState, &averageLufs);
VERIFY_OR_DEBUG_ASSERT(e == EBUR128_SUCCESS) {
- qWarning() << "AnalyzerEbur128::finalize() failed with" << e;
+ qWarning() << "AnalyzerEbur128::storeResults() failed with" << e;
return;
}
if (averageLufs == -HUGE_VAL || averageLufs == 0.0) {
- qWarning() << "AnalyzerEbur128::finalize() averageLufs invalid:"
+ qWarning() << "AnalyzerEbur128::storeResults() averageLufs invalid:"
<< averageLufs;
return;
}
diff --git a/src/analyzer/analyzerebur128.h b/src/analyzer/analyzerebur128.h
index 088e1b5b5d..d796af56bb 100644
--- a/src/analyzer/analyzerebur128.h
+++ b/src/analyzer/analyzerebur128.h
@@ -16,8 +16,8 @@ class AnalyzerEbur128 : public Analyzer {
}
bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
- bool process(const CSAMPLE* pIn, const int iLen) override;
- void finalize(TrackPointer tio) override;
+ bool processSamples(const CSAMPLE* pIn, const int iLen) override;
+ void storeResults(TrackPointer tio) override;
void cleanup() override;
private:
diff --git a/src/analyzer/analyzergain.cpp b/src/analyzer/analyzergain.cpp
index 5b8f362ee3..71f049d256 100644
--- a/src/analyzer/analyzergain.cpp
+++ b/src/analyzer/analyzergain.cpp
@@ -33,7 +33,7 @@ bool AnalyzerGain::initialize(TrackPointer tio, int sampleRate, int totalSamples
void AnalyzerGain::cleanup() {
}
-bool AnalyzerGain::process(const CSAMPLE *pIn, const int iLen) {
+bool AnalyzerGain::processSamples(const CSAMPLE *pIn, const int iLen) {
ScopedTimer t("AnalyzerGain::process()");
int halfLength = static_cast<int>(iLen / 2);
@@ -49,7 +49,7 @@ bool AnalyzerGain::process(const CSAMPLE *pIn, const int iLen) {
return m_pReplayGain->process(m_pLeftTempBuffer, m_pRightTempBuffer, halfLength);
}
-void AnalyzerGain::finalize(TrackPointer tio) {
+void AnalyzerGain::storeResults(TrackPointer tio) {
//TODO: We are going to store values as relative peaks so that "0" means that no replaygain has been evaluated.
// This means that we are going to transform from dB to peaks and viceversa.
// One may think to digg into replay_gain code and modify it so that
diff --git a/src/analyzer/analyzergain.h b/src/analyzer/analyzergain.h
index 1b574526f8..577b61f2f5 100644
--- a/src/analyzer/analyzergain.h
+++ b/src/analyzer/analyzergain.h
@@ -23,8 +23,8 @@ class AnalyzerGain : public Analyzer {
}
bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
- bool process(const CSAMPLE* pIn, const int iLen) override;
- void finalize(TrackPointer tio) override;
+ bool processSamples(const CSAMPLE* pIn, const int iLen) override;
+ void storeResults(TrackPointer tio) override;
void cleanup() override;
private:
diff --git a/src/analyzer/analyzerkey.cpp b/src/analyzer/analyzerkey.cpp
index 50ae516c46..736452b3ee 100644
--- a/src/analyzer/analyzerkey.cpp
+++ b/src/analyzer/analyzerkey.cpp
@@ -111,7 +111,7 @@ bool AnalyzerKey::shouldAnalyze(TrackPointer tio) const {
return true;
}
-bool AnalyzerKey::process(const CSAMPLE *pIn, const int iLen) {
+bool AnalyzerKey::processSamples(const CSAMPLE *pIn, const int iLen) {
VERIFY_OR_DEBUG_ASSERT(m_pPlugin) {
return false;
}
@@ -121,14 +121,14 @@ bool AnalyzerKey::process(const CSAMPLE *pIn, const int iLen) {
return true; // silently ignore remaining samples
}
- return m_pPlugin->process(pIn, iLen);
+ return m_pPlugin->processSamples(pIn, iLen);
}
void AnalyzerKey::cleanup() {
m_pPlugin.reset();
}
-void AnalyzerKey::finalize(TrackPointer tio) {
+void AnalyzerKey::storeResults(TrackPointer tio) {
VERIFY_OR_DEBUG_ASSERT(m_pPlugin) {
return;
}
diff --git a/src/analyzer/analyzerkey.h b/src/analyzer/analyzerkey.h
index 4bebe463dc..7c5fb3be19 100644
--- a/src/analyzer/analyzerkey.h
+++ b/src/analyzer/analyzerkey.h
@@ -20,8 +20,8 @@ class AnalyzerKey : public Analyzer {
static QList<mixxx::AnalyzerPluginInfo> availablePlugins();
bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
- bool process(const CSAMPLE *pIn, const int iLen) override;
- void finalize(TrackPointer tio) override;
+ bool processSamples(const CSAMPLE *pIn, const int iLen) override;
+ void storeResults(TrackPointer tio) override;
void cleanup() override;
private:
diff --git a/src/analyzer/analyzersilence.cpp b/src/analyzer/analyzersilence.cpp
index f9d37942a9..9d5c814f1e 100644
--- a/src/analyzer/analyzersilence.cpp
+++ b/src/analyzer/analyzersilence.cpp
@@ -72,7 +72,7 @@ bool AnalyzerSilence::initialize(TrackPointer tio, int sampleRate, int totalSamp
return true;
}
-bool AnalyzerSilence::process(const CSAMPLE* pIn, const int iLen) {
+bool AnalyzerSilence::processSamples(const CSAMPLE* pIn, const int iLen) {
for (int i = 0; i < iLen; i += mixxx::kAnalysisChannels) {
// Compute max of channels in this sample frame
CSAMPLE fMax = CSAMPLE_ZERO;
@@ -100,7 +100,7 @@ bool AnalyzerSilence::process(const CSAMPLE* pIn, const int iLen) {
void AnalyzerSilence::cleanup() {
}
-void AnalyzerSilence::finalize(TrackPointer tio) {
+void AnalyzerSilence::storeResults(TrackPointer tio) {
if (m_iSignalStart < 0) {
m_iSignalStart = 0;
}
diff --git a/src/analyzer/analyzersilence.h b/src/analyzer/analyzersilence.h
index f4de1a683d..b0b94f9c79 100644
--- a/src/analyzer/analyzersilence.h
+++ b/src/analyzer/analyzersilence.h
@@ -12,8 +12,8 @@ class AnalyzerSilence : public Analyzer {
~AnalyzerSilence() override = default;
bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
- bool process(const CSAMPLE* pIn, const int iLen) override;
- void finalize(TrackPointer tio) override;
+ bool processSamples(const CSAMPLE* pIn, const int iLen) override;
+ void storeResults(TrackPointer tio) override;
void cleanup() override;
private:
diff --git a/src/analyzer/analyzerthread.cpp b/src/analyzer/analyzerthread.cpp
index a0eb56f965..db7942002e 100644
--- a/src/analyzer/analyzerthread.cpp
+++ b/src/analyzer/analyzerthread.cpp
@@ -259,7 +259,7 @@ AnalyzerThread::AnalysisResult AnalyzerThread::analyzeAudioSource(
if (readableSampleFrames.frameLength() == mixxx::kAnalysisFramesPerBlock) {
// Complete chunk of audio samples has been read for analysis
for (auto&& analyzer : m_analyzers) {
- analyzer.process(
+ analyzer.processSamples(
readableSampleFrames.readableData(),
readableSampleFrames.readableLength());
}
diff --git a/src/analyzer/analyzerwaveform.cpp b/src/analyzer/analyzerwaveform.cpp
index 1e9294239e..f7dba829fc 100644
--- a/src/analyzer/analyzerwaveform.cpp
+++ b/src/analyzer/analyzerwaveform.cpp
@@ -167,7 +167,7 @@ void AnalyzerWaveform::destroyFilters() {
}
}
-bool AnalyzerWaveform::process(const CSAMPLE* buffer, const int bufferLength) {
+bool AnalyzerWaveform::processSamples(const CSAMPLE* buffer, const int bufferLength) {
VERIFY_OR_DEBUG_ASSERT(m_waveform) {
return false;
}
@@ -263,7 +263,7 @@ void AnalyzerWaveform::cleanup() {
m_waveformSummaryData = nullptr;
}
-void AnalyzerWaveform::finalize(TrackPointer tio) {
+void AnalyzerWaveform::storeResults(TrackPointer tio) {
// Force completion to waveform size
if (m_waveform) {
m_waveform->setSaveState(Waveform::SaveState::SavePending);
diff --git a/src/analyzer/analyzerwaveform.h b/src/analyzer/analyzerwaveform.h
index bfc1ccdd81..c12ccc3723 100644
--- a/src/analyzer/analyzerwaveform.h
+++ b/src/analyzer/analyzerwaveform.h
@@ -143,8 +143,8 @@ class AnalyzerWaveform : public Analyzer {
~AnalyzerWaveform() override;
bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
- bool process(const CSAMPLE* buffer, const int bufferLength) override;
- void finalize(TrackPointer tio) override;
+ bool processSamples(const CSAMPLE* buffer, const int bufferLength) override;
+ void storeResults(TrackPointer tio) override;
void cleanup() override;
private:
diff --git a/src/analyzer/plugins/analyzerplugin.h b/src/analyzer/plugins/analyzerplugin.h
index 2232d4fa06..429ffb9d7a 100644
--- a/src/analyzer/plugins/analyzerplugin.h
+++ b/src/analyzer/plugins/analyzerplugin.h
@@ -11,9 +11,10 @@ namespace mixxx {
struct AnalyzerPluginInfo {
AnalyzerPluginInfo(const QString& id,
- const QString& author,
- const QString& name)
- : id(id), author(author), name(name) { }
+ const QString& author,
+ const QString& name)
+ : id(id), author(author), name(name) {
+ }
QString id;
QString author;
QString name;
@@ -35,7 +36,7 @@ class AnalyzerPlugin {
virtual AnalyzerPluginInfo info() const = 0;
virtual bool initialize(int samplerate) = 0;
- virtual bool process(const CSAMPLE* pIn, const int iLen) = 0;
+ virtual bool processSamples(const CSAMPLE* pIn, const int iLen) = 0;
virtual bool finalize() = 0;
};
@@ -59,6 +60,6 @@ class AnalyzerKeyPlugin : public AnalyzerPlugin {
virtual KeyChangeList getKeyChanges() const = 0;
};
-} // namespace mixxx
+} // namespace mixxx
#endif /* ANALYZER_PLUGINS_ANALYZERPLUGIN_H */
diff --git a/src/analyzer/plugins/analyzerqueenmarybeats.cpp b/src/analyzer/plugins/analyzerqueenmarybeats.cpp
index b8ae46f2c7..3eca0f9b04 100644
--- a/src/analyzer/plugins/analyzerqueenmarybeats.cpp
+++ b/src/analyzer/plugins/analyzerqueenmarybeats.cpp
@@ -27,7 +27,7 @@ DFConfig makeDetectionFunctionConfig() {
return config;
}
-} // namespace
+} // namespace
AnalyzerQueenMaryBeats::AnalyzerQueenMaryBeats()
: m_iSampleRate(0) {
@@ -40,19 +40,19 @@ bool AnalyzerQueenMaryBeats::initialize(int samplerate) {
m_detectionResults.clear();
m_iSampleRate = samplerate;
m_pDetectionFunction = std::make_unique<DetectionFunction>(
- makeDetectionFunctionConfig());
+ makeDetectionFunctionConfig());
m_helper.initialize(
- kWindowSize, kStepSize, [this](double* pWindow, size_t) {
- // TODO(rryan) reserve?
- m_detectionResults.push_back(
- m_pDetectionFunction->processTimeDomain(pWindow));
- return true;
- });
+ kWindowSize, kStepSize, [this](double* pWindow, size_t) {
+ // TODO(rryan) reserve?
+ m_detectionResults.push_back(
+ m_pDetectionFunction->processTimeDomain(pWindow));
+ return true;
+ });
return true;
}
-bool AnalyzerQueenMaryBeats::process(const CSAMPLE* pIn, const int iLen) {
+bool AnalyzerQueenMaryBeats::processSamples(const CSAMPLE* pIn, const int iLen) {
DEBUG_ASSERT(iLen == kAnalysisSamplesPerBlock);
DEBUG_ASSERT(iLen % kAnalysisChannels == 0);
if (!m_pDetectionFunction) {
@@ -105,4 +105,4 @@ bool AnalyzerQueenMaryBeats::finalize() {
return true;
}
-} // namespace mixxx
+} // namespace mixxx
diff --git a/src/analyzer/plugins/analyzerqueenmarybeats.h b/src/analyzer/plugins/analyzerqueenmarybeats.h
index 8a894243f5..fbcd95839a 100644
--- a/src/analyzer/plugins/analyzerqueenmarybeats.h
+++ b/src/analyzer/plugins/analyzerqueenmarybeats.h
@@ -18,9 +18,9 @@ class AnalyzerQueenMaryBeats : public AnalyzerBeatsPlugin {
public:
static AnalyzerPluginInfo pluginInfo() {
return AnalyzerPluginInfo(
- "qm-tempotracker",
- QObject::tr("Queen Mary University London"),
- QObject::tr("Queen Mary Tempo and Beat Tracker"));
+ "qm-tempotracker",
+ QObject::tr("Queen Mary University London"),
+ QObject::tr("Queen Mary Tempo and Beat Tracker"));
}
AnalyzerQueenMaryBeats();
@@ -31,7 +31,7 @@ class AnalyzerQueenMaryBeats : public AnalyzerBeatsPlugin {
}
bool initialize(int samplerate) override;
- bool process(const CSAMPLE* pIn, const int iLen) override;
+ bool processSamples(const CSAMPLE* pIn, const int iLen) override;
bool finalize() override;
bool supportsBeatTracking() const override {
@@ -50,6 +50,6 @@ class AnalyzerQueenMaryBeats : public AnalyzerBeatsPlugin {
QVector<double> m_resultBeats;
};
-} // namespace mixxx
+} // namespace mixxx
#endif /* ANALYZER_PLUGINS_ANALYZERQUEENMARYBEATS_H */
diff --git a/src/analyzer/plugins/analyzerqueenmarykey.cpp b/src/analyzer/plugins/analyzerqueenmarykey.cpp
index 02d457426a..9dddd3b6ce 100644
--- a/src/analyzer/plugins/analyzerqueenmarykey.cpp
+++ b/src/analyzer/plugins/analyzerqueenmarykey.cpp
@@ -65,7 +65,7 @@ bool AnalyzerQueenMaryKey::initialize(int samplerate) {
});
}
-bool AnalyzerQueenMaryKey::process(const CSAMPLE* pIn, const int iLen) {
+bool AnalyzerQueenMaryKey::processSamples(const CSAMPLE* pIn, const int iLen) {
DEBUG_ASSERT(iLen == kAnalysisSamplesPerBlock);
DEBUG_ASSERT(iLen % kAnalysisChannels == 0);
diff --git a/src/analyzer/plugins/analyzerqueenmarykey.h b/src/analyzer/plugins/analyzerqueenmarykey.h
index 7f90b611ae..ffe2bdf5c5 100644
--- a/src/analyzer/plugins/analyzerqueenmarykey.h
+++ b/src/analyzer/plugins/analyzerqueenmarykey.h
@@ -31,7 +31,7 @@ class AnalyzerQueenMaryKey : public AnalyzerKeyPlugin {
}
bool initialize(int samplerate) override;
- bool process(const CSAMPLE* pIn, const int iLen) override;
+ bool processSamples(const CSAMPLE* pIn, const int iLen) override;
bool finalize() override;
KeyChangeList getKeyChanges() const override {
diff --git a/src/analyzer/plugins/analyzersoundtouchbeats.cpp b/src/analyzer/plugins/analyzersoundtouchbeats.cpp
index 638b7699d5..cc28733e4c 100644
--- a/src/analyzer/plugins/analyzersoundtouchbeats.cpp
+++ b/src/analyzer/plugins/analyzersoundtouchbeats.cpp
@@ -7,12 +7,13 @@
namespace mixxx {
-AnalyzerSoundTouchBeats::AnalyzerSoundTouchBeats() :
- m_downmixBuffer(kAnalysisFramesPerBlock),
- m_fResultBpm(0.0f) {
+AnalyzerSoundTouchBeats::AnalyzerSoundTouchBeats()
+ : m_downmixBuffer(kAnalysisFramesPerBlock),
+ m_fResultBpm(0.0f) {
}
-AnalyzerSoundTouchBeats::~AnalyzerSoundTouchBeats() { }
+AnalyzerSoundTouchBeats::~AnalyzerSoundTouchBeats() {
+}
bool AnalyzerSoundTouchBeats::initialize(int samplerate) {
m_fResultBpm = 0.0f;
@@ -20,7 +21,7 @@ bool AnalyzerSoundTouchBeats::initialize(int samplerate) {
return true;
}
-bool AnalyzerSoundTouchBeats::process(const CSAMPLE* pIn, const int iLen) {
+bool AnalyzerSoundTouchBeats::processSamples(const CSAMPLE* pIn, const int iLen) {
if (!m_pSoundTouch) {
return false;
}
@@ -47,4 +48,4 @@ bool AnalyzerSoundTouchBeats::finalize() {
return true;
}
-} // namespace mixxx
+} // namespace mixxx
diff --git a/src/analyzer/plugins/analyzersoundtouchbeats.h b/src/analyzer/plugins/analyzersoundtouchbeats.h
index 826646723d..838d8d5bc5 100644
--- a/src/analyzer/plugins/analyzersoundtouchbeats.h
+++ b/src/analyzer/plugins/analyzersoundtouchbeats.h
@@ -9,7 +9,7 @@
namespace soundtouch {
class BPMDetect;
-} // namespace soundtouch
+} // namespace soundtouch
namespace mixxx {
@@ -17,9 +17,9 @@ class AnalyzerSoundTouchBeats : public AnalyzerBeatsPlugin {
public:
static AnalyzerPluginInfo pluginInfo() {
return AnalyzerPluginInfo(
- "mixxxbpmdetection",
- "Olli Parviainen",
- QObject::tr("SoundTouch BPM Detector (Legacy)"));
+ "mixxxbpmdetection",
+ "Olli Parviainen",
+ QObject::tr("SoundTouch BPM Detector (Legacy)"));
}
AnalyzerSoundTouchBeats();
@@ -30,7 +30,7 @@ class AnalyzerSoundTouchBeats : public AnalyzerBeatsPlugin {
}
bool initialize(int samplerate) override;
- bool process(const CSAMPLE* pIn, const int iLen) override;
+ bool processSamples(const CSAMPLE* pIn, const int iLen) override;
bool finalize() override;
bool supportsBeatTracking() const override {
@@ -47,6 +47,6 @@ class AnalyzerSoundTouchBeats : public AnalyzerBeatsPlugin {
float m_fResultBpm;
};
-} // namespace mixxx
+} // namespace mixxx
#endif /* ANALYZER_PLUGINS_ANALYZERSOUNDTOUCHBEATS */