Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WaveRubber: Remove trailing whitespaces and fix formatting

Browse Source
This commit is contained in:
Jonas Kvinge 2024-06-12 17:45:01 +02:00
parent 05358cdfe4
commit 2a65e00988
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/analyzer/waverubber.cpp
View File

@ -24,11 +24,12 @@
const char *WaveRubber::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "WaveRubber");
WaveRubber::WaveRubber(QWidget *parent)
: AnalyzerBase(parent, 9) {}
: AnalyzerBase(parent, 9) {}
void WaveRubber::resizeEvent(QResizeEvent *e) {
Q_UNUSED(e)
canvas_ = QPixmap(size());
canvas_.fill(palette().color(QPalette::AlternateBase));
@ -49,12 +50,12 @@ void WaveRubber::analyze(QPainter &p, const Scope &s, bool new_frame) {
// Set the pen color to the QT palette highlight color
canvas_painter.setPen(palette().color(QPalette::Highlight));
// Get pointer to amplitude data
// Get pointer to amplitude data
const float *amplitude_data = s.data();
int mid_y = height() / 4;
int num_samples = s.size();
float x_scale = static_cast<float>(width()) / num_samples;
float prev_y = mid_y;
@ -68,13 +69,12 @@ void WaveRubber::analyze(QPainter &p, const Scope &s, bool new_frame) {
// Blend blue and green with highlight color from QT palette based on amplitude
QColor blended_color = QColor(rgb_value, highlight_color.green(), highlight_color.blue());
canvas_painter.setPen(blended_color);
int x = static_cast<int>(i * x_scale );
int y = static_cast<int>(mid_y - (s[i] * mid_y));
canvas_painter.drawLine(x, prev_y + mid_y, x + x_scale, y + mid_y); // Draw
int x = static_cast<int>(i * x_scale);
int y = static_cast<int>(mid_y - (s[i] * mid_y));
canvas_painter.drawLine(x, prev_y + mid_y, x + x_scale, y + mid_y); // Draw
prev_y = y;
}
canvas_painter.end();
@ -90,4 +90,3 @@ void WaveRubber::transform(Scope &s) {
void WaveRubber::demo(QPainter &p) {
analyze(p, Scope(fht_->size(), 0), new_frame_);
}

4
src/analyzer/waverubber.h
View File

@ -23,8 +23,8 @@
#include "analyzerbase.h"
class WaveRubber : public AnalyzerBase {
Q_OBJECT
public:
Q_INVOKABLE explicit WaveRubber(QWidget *parent);
@ -38,6 +38,4 @@ class WaveRubber : public AnalyzerBase {
private:
QPixmap canvas_;
};