Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

WaveRubber: use static_cast

This commit is contained in:
Jonas Kvinge 2024-06-12 18:06:37 +02:00
parent 2a65e00988
commit cb8022c55d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/analyzer/waverubber.cpp
View File

@ -35,7 +35,7 @@ void WaveRubber::resizeEvent(QResizeEvent *e) {
} }
void WaveRubber::analyze(QPainter &p, const Scope &s, bool new_frame) { void WaveRubber::analyze(QPainter &p, const Scope &s, const bool new_frame) {
if (!new_frame || engine_->state() == EngineBase::State::Paused) { if (!new_frame || engine_->state() == EngineBase::State::Paused) {
p.drawPixmap(0, 0, canvas_); p.drawPixmap(0, 0, canvas_);
@ -53,28 +53,28 @@ void WaveRubber::analyze(QPainter &p, const Scope &s, bool new_frame) {
// Get pointer to amplitude data // Get pointer to amplitude data
const float *amplitude_data = s.data(); const float *amplitude_data = s.data();
int mid_y = height() / 4; const int mid_y = height() / 4;
int num_samples = s.size(); const int num_samples = static_cast<int>(s.size());
float x_scale = static_cast<float>(width()) / num_samples; const float x_scale = static_cast<float>(width()) / static_cast<float>(num_samples);
float prev_y = mid_y; float prev_y = static_cast<float>(mid_y);
// Draw the waveform // Draw the waveform
for (int i = 0; i < num_samples; ++i) { for (int i = 0; i < num_samples; ++i) {
// Normalize amplitude to 0-1 range // Normalize amplitude to 0-1 range
float color_factor = amplitude_data[i] / 2.0f + 0.5f; const float color_factor = amplitude_data[i] / 2.0F + 0.5F;
int rgb_value = static_cast<int>(255 - color_factor * 255); const int rgb_value = static_cast<int>(255 - color_factor * 255);
QColor highlight_color = palette().color(QPalette::Highlight); QColor highlight_color = palette().color(QPalette::Highlight);
// Blend blue and green with highlight color from QT palette based on amplitude // 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()); QColor blended_color = QColor(rgb_value, highlight_color.green(), highlight_color.blue());
canvas_painter.setPen(blended_color); canvas_painter.setPen(blended_color);
int x = static_cast<int>(i * x_scale); const int x = static_cast<int>(static_cast<float>(i) * x_scale);
int y = static_cast<int>(mid_y - (s[i] * mid_y)); const int y = static_cast<int>(static_cast<float>(mid_y) - (s[i] * static_cast<float>(mid_y)));
canvas_painter.drawLine(x, prev_y + mid_y, x + x_scale, y + mid_y); // Draw canvas_painter.drawLine(x, static_cast<int>(prev_y + static_cast<float>(mid_y)), static_cast<int>(static_cast<float>(x) + x_scale), static_cast<int>(static_cast<float>(y + mid_y))); // Draw
prev_y = y; prev_y = static_cast<float>(y);
} }
canvas_painter.end(); canvas_painter.end();

2
src/analyzer/waverubber.h
View File

@ -32,7 +32,7 @@ class WaveRubber : public AnalyzerBase {
protected: protected:
void resizeEvent(QResizeEvent *e) override; 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 transform(Scope &scope) override;
void demo(QPainter &p) override; void demo(QPainter &p) override;