From 625929133c6ac1e9cbc3dd4c1f67dc1edf29fbf3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 9 Jul 2024 04:32:51 +0200 Subject: [PATCH] Rename analyzers and add turbine analyzer --- src/CMakeLists.txt | 10 +- src/analyzer/analyzercontainer.cpp | 12 ++- src/analyzer/blockanalyzer.cpp | 2 +- src/analyzer/blockanalyzer.h | 2 +- src/analyzer/boomanalyzer.h | 2 +- src/analyzer/rainbowanalyzer.cpp | 19 ++-- src/analyzer/rainbowanalyzer.h | 27 ++--- .../{sonogram.cpp => sonogramanalyzer.cpp} | 14 +-- .../{sonogram.h => sonogramanalyzer.h} | 13 +-- src/analyzer/turbineanalyzer.cpp | 100 ++++++++++++++++++ src/analyzer/turbineanalyzer.h | 41 +++++++ ...{waverubber.cpp => waverubberanalyzer.cpp} | 14 +-- .../{waverubber.h => waverubberanalyzer.h} | 4 +- 13 files changed, 201 insertions(+), 59 deletions(-) rename src/analyzer/{sonogram.cpp => sonogramanalyzer.cpp} (84%) rename src/analyzer/{sonogram.h => sonogramanalyzer.h} (82%) create mode 100644 src/analyzer/turbineanalyzer.cpp create mode 100644 src/analyzer/turbineanalyzer.h rename src/analyzer/{waverubber.cpp => waverubberanalyzer.cpp} (86%) rename src/analyzer/{waverubber.h => waverubberanalyzer.h} (90%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6cf36f28..65e82a1f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,9 +72,10 @@ set(SOURCES analyzer/analyzercontainer.cpp analyzer/blockanalyzer.cpp analyzer/boomanalyzer.cpp + analyzer/turbineanalyzer.cpp + analyzer/sonogramanalyzer.cpp + analyzer/waverubberanalyzer.cpp analyzer/rainbowanalyzer.cpp - analyzer/sonogram.cpp - analyzer/waverubber.cpp equalizer/equalizer.cpp equalizer/equalizerslider.cpp @@ -331,9 +332,10 @@ set(HEADERS analyzer/analyzercontainer.h analyzer/blockanalyzer.h analyzer/boomanalyzer.h + analyzer/turbineanalyzer.h + analyzer/sonogramanalyzer.h + analyzer/waverubberanalyzer.h analyzer/rainbowanalyzer.h - analyzer/sonogram.h - analyzer/waverubber.h equalizer/equalizer.h equalizer/equalizerslider.h diff --git a/src/analyzer/analyzercontainer.cpp b/src/analyzer/analyzercontainer.cpp index b44d07f2..4fbcbe79 100644 --- a/src/analyzer/analyzercontainer.cpp +++ b/src/analyzer/analyzercontainer.cpp @@ -39,9 +39,10 @@ #include "analyzerbase.h" #include "blockanalyzer.h" #include "boomanalyzer.h" +#include "turbineanalyzer.h" +#include "sonogramanalyzer.h" +#include "waverubberanalyzer.h" #include "rainbowanalyzer.h" -#include "sonogram.h" -#include "waverubber.h" #include "core/logging.h" #include "core/shared_ptr.h" @@ -88,10 +89,11 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent) AddAnalyzerType(); AddAnalyzerType(); - AddAnalyzerType(); + AddAnalyzerType(); + AddAnalyzerType(); + AddAnalyzerType(); AddAnalyzerType(); - AddAnalyzerType(); - AddAnalyzerType(); + AddAnalyzerType(); disable_action_ = context_menu_->addAction(tr("No analyzer"), this, &AnalyzerContainer::DisableAnalyzer); disable_action_->setCheckable(true); diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index f3d9504c..45212e70 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -136,7 +136,7 @@ void BlockAnalyzer::transform(Scope &s) { } -void BlockAnalyzer::analyze(QPainter &p, const Scope &s, bool new_frame) { +void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) { // y = 2 3 2 1 0 2 // . . . . # . diff --git a/src/analyzer/blockanalyzer.h b/src/analyzer/blockanalyzer.h index 28284a1e..4dbabf36 100644 --- a/src/analyzer/blockanalyzer.h +++ b/src/analyzer/blockanalyzer.h @@ -54,7 +54,7 @@ class BlockAnalyzer : public AnalyzerBase { protected: void transform(Scope&) override; - void analyze(QPainter &p, const Scope&, bool new_frame) override; + void analyze(QPainter &p, const Scope &s, const bool new_frame) override; void resizeEvent(QResizeEvent*) override; virtual void paletteChange(const QPalette&); void framerateChanged() override; diff --git a/src/analyzer/boomanalyzer.h b/src/analyzer/boomanalyzer.h index ed26e04e..240a4b4d 100644 --- a/src/analyzer/boomanalyzer.h +++ b/src/analyzer/boomanalyzer.h @@ -45,7 +45,7 @@ class BoomAnalyzer : public AnalyzerBase { static const char *kName; void transform(Scope &s) override; - void analyze(QPainter &p, const Scope&, const bool new_frame) override; + void analyze(QPainter &p, const Scope &scope, const bool new_frame) override; public slots: void changeK_barHeight(int); diff --git a/src/analyzer/rainbowanalyzer.cpp b/src/analyzer/rainbowanalyzer.cpp index 56d514f4..c734ca4b 100644 --- a/src/analyzer/rainbowanalyzer.cpp +++ b/src/analyzer/rainbowanalyzer.cpp @@ -41,18 +41,21 @@ #include "fht.h" #include "analyzerbase.h" +const char *NyanCatAnalyzer::kName = "Nyanalyzer Cat"; +const char *RainbowDashAnalyzer::kName = "Rainbow Dash"; + +RainbowAnalyzer::RainbowType RainbowAnalyzer::rainbowtype; const int RainbowAnalyzer::kHeight[] = { 21, 33 }; const int RainbowAnalyzer::kWidth[] = { 34, 53 }; const int RainbowAnalyzer::kFrameCount[] = { 6, 16 }; -const int RainbowAnalyzer::kRainbowHeight[] = { 21, 16 }; -const int RainbowAnalyzer::kRainbowOverlap[] = { 13, 15 }; const int RainbowAnalyzer::kSleepingHeight[] = { 24, 33 }; -const char *NyanCatAnalyzer::kName = "Nyanalyzer Cat"; -const char *RainbowDashAnalyzer::kName = "Rainbow Dash"; -const float RainbowAnalyzer::kPixelScale = 0.02F; - -RainbowAnalyzer::RainbowType RainbowAnalyzer::rainbowtype; +namespace { +constexpr int kFrameIntervalMs = 150; +constexpr int kRainbowHeight[] = { 21, 16 }; +constexpr int kRainbowOverlap[] = { 13, 15 }; +constexpr float kPixelScale = 0.02F; +} // namespace RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent) : AnalyzerBase(parent, 9), @@ -106,7 +109,7 @@ void RainbowAnalyzer::resizeEvent(QResizeEvent *e) { } -void RainbowAnalyzer::analyze(QPainter &p, const Scope &s, bool new_frame) { +void RainbowAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) { // Discard the second half of the transform const int scope_size = static_cast(s.size() / 2); diff --git a/src/analyzer/rainbowanalyzer.h b/src/analyzer/rainbowanalyzer.h index a16e8c3a..b2c71027 100644 --- a/src/analyzer/rainbowanalyzer.h +++ b/src/analyzer/rainbowanalyzer.h @@ -49,44 +49,37 @@ class RainbowAnalyzer : public AnalyzerBase { Dash = 1 }; - RainbowAnalyzer(const RainbowType rbtype, QWidget *parent); + explicit RainbowAnalyzer(const RainbowType rbtype, QWidget *parent); protected: - void transform(Scope&) override; - void analyze(QPainter &p, const Scope&, bool new_frame) override; + void transform(Scope &s) override; + void analyze(QPainter &p, const Scope &s, const bool new_frame) override; void timerEvent(QTimerEvent *e) override; void resizeEvent(QResizeEvent *e) override; private: + static const int kRainbowBands = 6; + static const int kHistorySize = 128; + static RainbowType rainbowtype; static const int kHeight[]; static const int kWidth[]; static const int kFrameCount[]; - static const int kRainbowHeight[]; - static const int kRainbowOverlap[]; static const int kSleepingHeight[]; - static const int kHistorySize = 128; - static const int kRainbowBands = 6; - static const float kPixelScale; - - static const int kFrameIntervalMs = 150; - - static RainbowType rainbowtype; - - inline QRect SourceRect(RainbowType _rainbowtype) const { + inline QRect SourceRect(const RainbowType _rainbowtype) const { return QRect(0, kHeight[_rainbowtype] * frame_, kWidth[_rainbowtype], kHeight[_rainbowtype]); } - inline QRect SleepingSourceRect(RainbowType _rainbowtype) const { + inline QRect SleepingSourceRect(const RainbowType _rainbowtype) const { return QRect(0, kHeight[_rainbowtype] * kFrameCount[_rainbowtype], kWidth[_rainbowtype], kSleepingHeight[_rainbowtype]); } - inline QRect DestRect(RainbowType _rainbowtype) const { + inline QRect DestRect(const RainbowType _rainbowtype) const { return QRect(width() - kWidth[_rainbowtype], (height() - kHeight[_rainbowtype]) / 2, kWidth[_rainbowtype], kHeight[_rainbowtype]); } - inline QRect SleepingDestRect(RainbowType _rainbowtype) const { + inline QRect SleepingDestRect(const RainbowType _rainbowtype) const { return QRect(width() - kWidth[_rainbowtype], (height() - kSleepingHeight[_rainbowtype]) / 2, kWidth[_rainbowtype], kSleepingHeight[_rainbowtype]); } diff --git a/src/analyzer/sonogram.cpp b/src/analyzer/sonogramanalyzer.cpp similarity index 84% rename from src/analyzer/sonogram.cpp rename to src/analyzer/sonogramanalyzer.cpp index 25431ff3..bfa05aff 100644 --- a/src/analyzer/sonogram.cpp +++ b/src/analyzer/sonogramanalyzer.cpp @@ -26,14 +26,14 @@ #include "engine/enginebase.h" -#include "sonogram.h" +#include "sonogramanalyzer.h" -const char *Sonogram::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Sonogram"); +const char *SonogramAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Sonogram"); -Sonogram::Sonogram(QWidget *parent) +SonogramAnalyzer::SonogramAnalyzer(QWidget *parent) : AnalyzerBase(parent, 9) {} -void Sonogram::resizeEvent(QResizeEvent *e) { +void SonogramAnalyzer::resizeEvent(QResizeEvent *e) { Q_UNUSED(e) @@ -42,7 +42,7 @@ void Sonogram::resizeEvent(QResizeEvent *e) { } -void Sonogram::analyze(QPainter &p, const Scope &s, bool new_frame) { +void SonogramAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) { if (!new_frame || engine_->state() == EngineBase::State::Paused) { p.drawPixmap(0, 0, canvas_); @@ -81,7 +81,7 @@ void Sonogram::analyze(QPainter &p, const Scope &s, bool new_frame) { } -void Sonogram::transform(Scope &scope) { +void SonogramAnalyzer::transform(Scope &scope) { fht_->power2(scope.data()); fht_->scale(scope.data(), 1.0 / 256); @@ -89,6 +89,6 @@ void Sonogram::transform(Scope &scope) { } -void Sonogram::demo(QPainter &p) { +void SonogramAnalyzer::demo(QPainter &p) { analyze(p, Scope(fht_->size(), 0), new_frame_); } diff --git a/src/analyzer/sonogram.h b/src/analyzer/sonogramanalyzer.h similarity index 82% rename from src/analyzer/sonogram.h rename to src/analyzer/sonogramanalyzer.h index ca21a698..f533a361 100644 --- a/src/analyzer/sonogram.h +++ b/src/analyzer/sonogramanalyzer.h @@ -21,24 +21,25 @@ along with Strawberry. If not, see . */ -#ifndef SONOGRAM_H -#define SONOGRAM_H +#ifndef SONOGRAMANALYZER_H +#define SONOGRAMANALYZER_H #include #include #include "analyzerbase.h" -class Sonogram : public AnalyzerBase { +class SonogramAnalyzer : public AnalyzerBase { Q_OBJECT + public: - Q_INVOKABLE explicit Sonogram(QWidget *parent); + Q_INVOKABLE explicit SonogramAnalyzer(QWidget *parent); static const char *kName; protected: void resizeEvent(QResizeEvent *e) override; - void analyze(QPainter &p, const Scope &s, bool new_frame) override; + void analyze(QPainter &p, const Scope &s, const bool new_frame) override; void transform(Scope &scope) override; void demo(QPainter &p) override; @@ -46,4 +47,4 @@ class Sonogram : public AnalyzerBase { QPixmap canvas_; }; -#endif // SONOGRAM_H +#endif // SONOGRAMANALYZER_H diff --git a/src/analyzer/turbineanalyzer.cpp b/src/analyzer/turbineanalyzer.cpp new file mode 100644 index 00000000..61bb089c --- /dev/null +++ b/src/analyzer/turbineanalyzer.cpp @@ -0,0 +1,100 @@ +/* + Strawberry Music Player + This file was part of Clementine. + Copyright 2003, Stanislav Karchebny + Copyright 2003, Max Howell + Copyright 2009-2010, David Sansome + Copyright 2014-2015, Mark Furneaux + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#include "config.h" + +#include +#include + +#include + +#include "turbineanalyzer.h" +#include "engine/enginebase.h" + +const char *TurbineAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Turbine"); + +TurbineAnalyzer::TurbineAnalyzer(QWidget *parent) : BoomAnalyzer(parent) {} + +void TurbineAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame) { + + if (!new_frame || engine_->state() == EngineBase::State::Paused) { + p.drawPixmap(0, 0, canvas_); + return; + } + + const uint hd2 = height() / 2; + const uint kMaxHeight = hd2 - 1; + + QPainter canvas_painter(&canvas_); + canvas_.fill(palette().color(QPalette::Window)); + + AnalyzerBase::interpolate(scope, scope_); + + for (uint i = 0, x = 0, y = 0; i < static_cast(bands_); ++i, x += kColumnWidth + 1) { + float h = static_cast(std::min(log10(scope_[i] * 256.0) * F_ * 0.5, kMaxHeight * 1.0)); + + if (h > bar_height_[i]) { + bar_height_[i] = h; + if (h > peak_height_[i]) { + peak_height_[i] = h; + peak_speed_[i] = 0.01; + } + else { + goto peak_handling; + } + } + else { + if (bar_height_[i] > 0.0) { + bar_height_[i] -= K_barHeight_; // 1.4 + if (bar_height_[i] < 0.0) bar_height_[i] = 0.0; + } + + peak_handling: + if (peak_height_[i] > 0.0) { + peak_height_[i] -= peak_speed_[i]; + peak_speed_[i] *= F_peakSpeed_; // 1.12 + peak_height_[i] = std::max(0.0, std::max(bar_height_[i], peak_height_[i])); + } + } + + y = hd2 - static_cast(bar_height_[i]); + canvas_painter.drawPixmap(static_cast(x + 1), static_cast(y), barPixmap_, 0, static_cast(y), -1, -1); + canvas_painter.drawPixmap(static_cast(x + 1), static_cast(hd2), barPixmap_, 0, static_cast(bar_height_[i]), -1, -1); + + canvas_painter.setPen(fg_); + if (bar_height_[i] > 0) { + canvas_painter.drawRect(static_cast(x), static_cast(y), kColumnWidth - 1, static_cast(bar_height_[i]) * 2 - 1); + } + + const uint x2 = x + kColumnWidth - 1; + canvas_painter.setPen(palette().color(QPalette::Midlight)); + y = hd2 - static_cast(peak_height_[i]); + canvas_painter.drawLine(static_cast(x), static_cast(y), static_cast(x2), static_cast(y)); + y = hd2 + static_cast(peak_height_[i]); + canvas_painter.drawLine(static_cast(x), static_cast(y), static_cast(x2), static_cast(y)); + } + + p.drawPixmap(0, 0, canvas_); + +} diff --git a/src/analyzer/turbineanalyzer.h b/src/analyzer/turbineanalyzer.h new file mode 100644 index 00000000..ef4c8ea8 --- /dev/null +++ b/src/analyzer/turbineanalyzer.h @@ -0,0 +1,41 @@ +/* + Strawberry Music Player + This file was part of Clementine. + Copyright 2003, Stanislav Karchebny + Copyright 2009-2010, David Sansome + Copyright 2014, Krzysztof Sobiecki + Copyright 2014, John Maguire + + Clementine is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Clementine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Clementine. If not, see . +*/ + +#ifndef TURBINEANALYZER_H +#define TURBINEANALYZER_H + +#include "boomanalyzer.h" + +class QPainter; + +class TurbineAnalyzer : public BoomAnalyzer { + Q_OBJECT + + public: + Q_INVOKABLE explicit TurbineAnalyzer(QWidget *parent); + + void analyze(QPainter &p, const Scope &scope, const bool new_frame); + + static const char *kName; +}; + +#endif // TURBINEANALYZER_H diff --git a/src/analyzer/waverubber.cpp b/src/analyzer/waverubberanalyzer.cpp similarity index 86% rename from src/analyzer/waverubber.cpp rename to src/analyzer/waverubberanalyzer.cpp index 9ff42c56..cbb7a84b 100644 --- a/src/analyzer/waverubber.cpp +++ b/src/analyzer/waverubberanalyzer.cpp @@ -19,14 +19,14 @@ #include #include #include "engine/enginebase.h" -#include "waverubber.h" +#include "waverubberanalyzer.h" -const char *WaveRubber::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "WaveRubber"); +const char *WaveRubberAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "WaveRubber"); -WaveRubber::WaveRubber(QWidget *parent) +WaveRubberAnalyzer::WaveRubberAnalyzer(QWidget *parent) : AnalyzerBase(parent, 9) {} -void WaveRubber::resizeEvent(QResizeEvent *e) { +void WaveRubberAnalyzer::resizeEvent(QResizeEvent *e) { Q_UNUSED(e) @@ -35,7 +35,7 @@ void WaveRubber::resizeEvent(QResizeEvent *e) { } -void WaveRubber::analyze(QPainter &p, const Scope &s, const bool new_frame) { +void WaveRubberAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) { if (!new_frame || engine_->state() == EngineBase::State::Paused) { p.drawPixmap(0, 0, canvas_); @@ -82,11 +82,11 @@ void WaveRubber::analyze(QPainter &p, const Scope &s, const bool new_frame) { } -void WaveRubber::transform(Scope &s) { +void WaveRubberAnalyzer::transform(Scope &s) { // No need transformation for waveform analyzer Q_UNUSED(s); } -void WaveRubber::demo(QPainter &p) { +void WaveRubberAnalyzer::demo(QPainter &p) { analyze(p, Scope(fht_->size(), 0), new_frame_); } diff --git a/src/analyzer/waverubber.h b/src/analyzer/waverubberanalyzer.h similarity index 90% rename from src/analyzer/waverubber.h rename to src/analyzer/waverubberanalyzer.h index ee211e44..421f6143 100644 --- a/src/analyzer/waverubber.h +++ b/src/analyzer/waverubberanalyzer.h @@ -22,11 +22,11 @@ #include "analyzerbase.h" -class WaveRubber : public AnalyzerBase { +class WaveRubberAnalyzer : public AnalyzerBase { Q_OBJECT public: - Q_INVOKABLE explicit WaveRubber(QWidget *parent); + Q_INVOKABLE explicit WaveRubberAnalyzer(QWidget *parent); static const char *kName;