From fc70483791ed537a905af97a953e9daf9559604a Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 13 Sep 2025 15:18:32 +0200 Subject: [PATCH] Removed obsolete func --- src/libs/core/impl/http/SendQueue.cpp | 3 ++- src/libs/core/include/core/Utils.hpp | 17 +++++++---------- .../services/artwork/impl/ArtworkService.cpp | 5 +++-- .../subsonic/impl/endpoints/MediaRetrieval.cpp | 4 ++-- src/lms/ui/MediaPlayer.cpp | 5 +++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/libs/core/impl/http/SendQueue.cpp b/src/libs/core/impl/http/SendQueue.cpp index 0278fc9c..bdbe8931 100644 --- a/src/libs/core/impl/http/SendQueue.cpp +++ b/src/libs/core/impl/http/SendQueue.cpp @@ -19,6 +19,7 @@ #include "SendQueue.hpp" +#include #include #include @@ -308,7 +309,7 @@ namespace lms::core::http void SendQueue::throttle(std::chrono::seconds requestedDuration) { - const std::chrono::seconds duration{ clamp(requestedDuration, _minRetryWaitDuration, _maxRetryWaitDuration) }; + const std::chrono::seconds duration{ std::clamp(requestedDuration, _minRetryWaitDuration, _maxRetryWaitDuration) }; LOG(DEBUG, "Throttling for " << duration.count() << " seconds"); _throttleTimer.expires_after(duration); diff --git a/src/libs/core/include/core/Utils.hpp b/src/libs/core/include/core/Utils.hpp index 1a13f33f..46430baa 100644 --- a/src/libs/core/include/core/Utils.hpp +++ b/src/libs/core/include/core/Utils.hpp @@ -24,19 +24,16 @@ namespace lms::core::utils { - template> - constexpr T clamp(T v, T lo, T hi, Compare comp = {}) - { - assert(!comp(hi, lo)); - return comp(v, lo) ? lo : comp(hi, v) ? hi : - v; - } - template - void - push_back_if_not_present(Container& container, const T& val) + void push_back_if_not_present(Container& container, const T& val) { if (std::find(std::cbegin(container), std::cend(container), val) == std::cend(container)) container.push_back(val); } + + template + struct overloads : Ts... + { + using Ts::operator()...; + }; } // namespace lms::core::utils \ No newline at end of file diff --git a/src/libs/services/artwork/impl/ArtworkService.cpp b/src/libs/services/artwork/impl/ArtworkService.cpp index 2781d1cc..eb380d1b 100644 --- a/src/libs/services/artwork/impl/ArtworkService.cpp +++ b/src/libs/services/artwork/impl/ArtworkService.cpp @@ -19,9 +19,10 @@ #include "ArtworkService.hpp" +#include + #include "core/IConfig.hpp" #include "core/ILogger.hpp" -#include "core/Utils.hpp" #include "database/IDb.hpp" #include "database/Session.hpp" #include "database/objects/Artist.hpp" @@ -243,7 +244,7 @@ namespace lms::artwork void ArtworkService::setJpegQuality(unsigned quality) { - _jpegQuality = core::utils::clamp(quality, 1, 100); + _jpegQuality = std::clamp(quality, 1, 100); LMS_LOG(COVER, INFO, "JPEG export quality = " << _jpegQuality); } diff --git a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp index 189048a0..1ad9d273 100644 --- a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp +++ b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp @@ -19,13 +19,13 @@ #include "MediaRetrieval.hpp" +#include #include #include "core/FileResourceHandlerCreator.hpp" #include "core/ILogger.hpp" #include "core/IResourceHandler.hpp" #include "core/String.hpp" -#include "core/Utils.hpp" #include "av/Exception.hpp" #include "av/IAudioFile.hpp" @@ -385,7 +385,7 @@ namespace lms::api::subsonic std::optional size{ getParameterAs(context.parameters, "size") }; if (size) - *size = core::utils::clamp(*size, std::size_t{ 32 }, std::size_t{ 2048 }); + *size = std::clamp(*size, std::size_t{ 32 }, std::size_t{ 2048 }); std::shared_ptr image{ core::Service::get()->getImage(coverArtId.id, size) }; if (!image) diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp index f423ebf7..6fa7e23f 100644 --- a/src/lms/ui/MediaPlayer.cpp +++ b/src/lms/ui/MediaPlayer.cpp @@ -19,6 +19,8 @@ #include "MediaPlayer.hpp" +#include + #include #include #include @@ -27,7 +29,6 @@ #include "core/ILogger.hpp" #include "core/String.hpp" -#include "core/Utils.hpp" #include "database/Session.hpp" #include "database/Types.hpp" #include "database/objects/Artist.hpp" @@ -142,7 +143,7 @@ namespace lms::ui if (!value) return std::nullopt; - return core::utils::clamp(*value, (double)MediaPlayer::Settings::ReplayGain::minPreAmpGain, (double)MediaPlayer::Settings::ReplayGain::maxPreAmpGain); + return std::clamp(*value, (double)MediaPlayer::Settings::ReplayGain::minPreAmpGain, (double)MediaPlayer::Settings::ReplayGain::maxPreAmpGain); } MediaPlayer::Settings settingsfromJSString(const std::string& strSettings)