From eee3445d2f17c7baeaed17d2de826f090a103e32 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 6 Feb 2022 04:19:45 +0100 Subject: [PATCH] Silence some conversion warnings --- ext/libstrawberry-tagreader/tagreadertaglib.cpp | 12 ++++++------ src/analyzer/analyzerbase.cpp | 2 +- src/analyzer/blockanalyzer.cpp | 2 +- src/analyzer/boomanalyzer.cpp | 2 +- src/engine/gstenginepipeline.cpp | 8 ++++---- src/playlist/playlistdelegates.cpp | 4 ++-- src/widgets/volumeslider.cpp | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ext/libstrawberry-tagreader/tagreadertaglib.cpp b/ext/libstrawberry-tagreader/tagreadertaglib.cpp index cd8a81039..ec2d2c4ff 100644 --- a/ext/libstrawberry-tagreader/tagreadertaglib.cpp +++ b/ext/libstrawberry-tagreader/tagreadertaglib.cpp @@ -1040,13 +1040,13 @@ TagLib::ID3v2::PopularimeterFrame *TagReaderTagLib::GetPOPMFrameFromTag(TagLib:: float TagReaderTagLib::ConvertPOPMRating(const int POPM_rating) { - if (POPM_rating < 0x01) return 0.0; - else if (POPM_rating < 0x40) return 0.20; - else if (POPM_rating < 0x80) return 0.40; - else if (POPM_rating < 0xC0) return 0.60; - else if (POPM_rating < 0xFC) return 0.80; + if (POPM_rating < 0x01) return 0.0F; + else if (POPM_rating < 0x40) return 0.20F; + else if (POPM_rating < 0x80) return 0.40F; + else if (POPM_rating < 0xC0) return 0.60F; + else if (POPM_rating < 0xFC) return 0.80F; - return 1.0; + return 1.0F; } diff --git a/src/analyzer/analyzerbase.cpp b/src/analyzer/analyzerbase.cpp index de00a8d2f..fa2d16235 100644 --- a/src/analyzer/analyzerbase.cpp +++ b/src/analyzer/analyzerbase.cpp @@ -73,7 +73,7 @@ void Analyzer::Base::transform(Scope &scope) { } fht_->logSpectrum(scope.data(), aux.data()); - fht_->scale(scope.data(), 1.0 / 20); + fht_->scale(scope.data(), 1.0F / 20); scope.resize(fht_->size() / 2); // second half of values are rubbish diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index ed5e3cedd..3be125235 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -130,7 +130,7 @@ void BlockAnalyzer::transform(Analyzer::Scope &s) { for (uint x = 0; x < s.size(); ++x) s[x] *= 2; fht_->spectrum(s.data()); - fht_->scale(s.data(), 1.0 / 20); + fht_->scale(s.data(), 1.0F / 20); // the second half is pretty dull, so only show it if the user has a large analyzer by setting to scope_.size() if large we prevent interpolation of large analyzers, this is good! s.resize(scope_.size() <= kMaxColumns / 2 ? kMaxColumns / 2 : scope_.size()); diff --git a/src/analyzer/boomanalyzer.cpp b/src/analyzer/boomanalyzer.cpp index af09ebe4f..fd3d21276 100644 --- a/src/analyzer/boomanalyzer.cpp +++ b/src/analyzer/boomanalyzer.cpp @@ -102,7 +102,7 @@ void BoomAnalyzer::resizeEvent(QResizeEvent *e) { void BoomAnalyzer::transform(Scope &s) { fht_->spectrum(s.data()); - fht_->scale(s.data(), 1.0 / 50); + fht_->scale(s.data(), 1.0F / 50); s.resize(scope_.size() <= static_cast(kMaxBandCount) / 2 ? kMaxBandCount / 2 : scope_.size()); diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index fa8dfe3d0..035a16bf0 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -1383,10 +1383,10 @@ void GstEnginePipeline::UpdateEqualizer() { for (int i = 0; i < kEqBandCount; ++i) { float gain = eq_enabled_ ? static_cast(eq_band_gains_[i]) : static_cast(0.0); if (gain < 0) { - gain *= 0.24; + gain *= 0.24F; } else { - gain *= 0.12; + gain *= 0.12F; } const int index_in_eq = i + 1; @@ -1397,8 +1397,8 @@ void GstEnginePipeline::UpdateEqualizer() { } // Update preamp - float preamp = 1.0; - if (eq_enabled_) preamp = static_cast(eq_preamp_ + 100) * static_cast(0.01); // To scale from 0.0 to 2.0 + float preamp = 1.0F; + if (eq_enabled_) preamp = static_cast(eq_preamp_ + 100) * 0.01F; // To scale from 0.0 to 2.0 g_object_set(G_OBJECT(equalizer_preamp_), "volume", preamp, nullptr); diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp index f6036c52f..77952195a 100644 --- a/src/playlist/playlistdelegates.cpp +++ b/src/playlist/playlistdelegates.cpp @@ -82,7 +82,7 @@ const int QueuedItemDelegate::kQueueBoxLength = 30; const QRgb QueuedItemDelegate::kQueueBoxGradientColor1 = qRgb(102, 150, 227); const QRgb QueuedItemDelegate::kQueueBoxGradientColor2 = qRgb(77, 121, 200); const int QueuedItemDelegate::kQueueOpacitySteps = 10; -const float QueuedItemDelegate::kQueueOpacityLowerBound = 0.4; +const float QueuedItemDelegate::kQueueOpacityLowerBound = 0.4F; const int PlaylistDelegateBase::kMinHeight = 19; @@ -100,7 +100,7 @@ void QueuedItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op if (ok && queue_pos != -1) { float opacity = static_cast(kQueueOpacitySteps - qMin(kQueueOpacitySteps, queue_pos)); opacity /= kQueueOpacitySteps; - opacity *= static_cast(1.0) - static_cast(kQueueOpacityLowerBound); + opacity *= 1.0F - kQueueOpacityLowerBound; opacity += kQueueOpacityLowerBound; DrawBox(painter, option.rect, option.font, QString::number(queue_pos + 1), kQueueBoxLength, opacity); } diff --git a/src/widgets/volumeslider.cpp b/src/widgets/volumeslider.cpp index 712430bfc..fcff90693 100644 --- a/src/widgets/volumeslider.cpp +++ b/src/widgets/volumeslider.cpp @@ -424,8 +424,8 @@ void VolumeSlider::drawVolumeSliderHandle() { painter.drawImage(0, 0, pixmapHandle); // BEGIN Calculate handle animation pixmaps for mouse-over effect - float opacity = 0.0; - const float step = 1.0 / ANIM_MAX; + float opacity = 0.0F; + const float step = 1.0F / ANIM_MAX; QImage dst; handle_pixmaps_.clear(); for (int i = 0; i < ANIM_MAX; ++i) {