From d843cf5c06d6cf230c2ed93fb978c57f11502535 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 2 Dec 2025 22:57:15 +0100 Subject: [PATCH] Fixed various warnings --- src/libs/audio/impl/ffmpeg/TagReader.cpp | 3 +-- src/libs/audio/impl/ffmpeg/TagReader.hpp | 1 - src/libs/audio/include/audio/IAudioFileInfo.hpp | 2 +- .../audiofile/AudioFileScanOperation.hpp | 2 +- .../transcoding/impl/TranscodeService.cpp | 8 +++----- .../transcoding/impl/TranscodeService.hpp | 5 +---- .../services/transcoding/ITranscodeService.hpp | 17 ++++------------- .../subsonic/impl/endpoints/MediaRetrieval.hpp | 2 +- src/libs/subsonic/impl/responses/Album.hpp | 2 +- src/libs/subsonic/impl/responses/AlbumInfo.hpp | 2 +- src/libs/subsonic/impl/responses/Artist.hpp | 2 +- src/libs/subsonic/impl/responses/Genre.hpp | 2 +- src/libs/subsonic/impl/responses/Lyrics.hpp | 2 +- src/libs/subsonic/impl/responses/Playlist.hpp | 2 +- src/libs/subsonic/impl/responses/Podcast.hpp | 2 +- src/libs/subsonic/impl/responses/Song.hpp | 2 +- src/libs/subsonic/impl/responses/User.hpp | 2 +- src/lms/main.cpp | 2 +- 18 files changed, 22 insertions(+), 38 deletions(-) diff --git a/src/libs/audio/impl/ffmpeg/TagReader.cpp b/src/libs/audio/impl/ffmpeg/TagReader.cpp index 8c3eccda..dcf648aa 100644 --- a/src/libs/audio/impl/ffmpeg/TagReader.cpp +++ b/src/libs/audio/impl/ffmpeg/TagReader.cpp @@ -144,8 +144,7 @@ namespace lms::audio::ffmpeg } // namespace TagReader::TagReader(const AudioFile& audioFile, bool enableExtraDebugLogs) - : _audioFile{ audioFile } - , _metaDataMap{ audioFile.extractMetaData() } + : _metaDataMap{ audioFile.extractMetaData() } { if (enableExtraDebugLogs && core::Service::get()->isSeverityActive(core::logging::Severity::DEBUG)) { diff --git a/src/libs/audio/impl/ffmpeg/TagReader.hpp b/src/libs/audio/impl/ffmpeg/TagReader.hpp index 25e7bd7f..9864e0d3 100644 --- a/src/libs/audio/impl/ffmpeg/TagReader.hpp +++ b/src/libs/audio/impl/ffmpeg/TagReader.hpp @@ -39,7 +39,6 @@ namespace lms::audio::ffmpeg void visitPerformerTags(PerformerVisitor visitor) const override; void visitLyricsTags(LyricsVisitor visitor) const override; - const AudioFile& _audioFile; AudioFile::MetadataMap _metaDataMap; }; } // namespace lms::audio::ffmpeg diff --git a/src/libs/audio/include/audio/IAudioFileInfo.hpp b/src/libs/audio/include/audio/IAudioFileInfo.hpp index 68639161..adb707e5 100644 --- a/src/libs/audio/include/audio/IAudioFileInfo.hpp +++ b/src/libs/audio/include/audio/IAudioFileInfo.hpp @@ -21,7 +21,7 @@ namespace lms::audio { - class AudioProperties; + struct AudioProperties; class IImageReader; class ITagReader; diff --git a/src/libs/services/scanner/impl/scanners/audiofile/AudioFileScanOperation.hpp b/src/libs/services/scanner/impl/scanners/audiofile/AudioFileScanOperation.hpp index d78f1bb0..37e03242 100644 --- a/src/libs/services/scanner/impl/scanners/audiofile/AudioFileScanOperation.hpp +++ b/src/libs/services/scanner/impl/scanners/audiofile/AudioFileScanOperation.hpp @@ -39,7 +39,7 @@ namespace lms::db namespace lms::scanner { - class AudioFileInfoParserSet; + struct AudioFileInfoParserSet; class TrackMetadataParser; struct ImageInfo diff --git a/src/libs/services/transcoding/impl/TranscodeService.cpp b/src/libs/services/transcoding/impl/TranscodeService.cpp index 5108e8df..3306f22f 100644 --- a/src/libs/services/transcoding/impl/TranscodeService.cpp +++ b/src/libs/services/transcoding/impl/TranscodeService.cpp @@ -34,14 +34,12 @@ namespace lms::transcoding } } // namespace - std::unique_ptr createTranscodeService(db::IDb& db, core::IChildProcessManager& childProcessManager) + std::unique_ptr createTranscodeService() { - return std::make_unique(db, childProcessManager); + return std::make_unique(); } - TranscodeService::TranscodeService(db::IDb& db, core::IChildProcessManager& childProcessManager) - : _db{ db } - , _childProcessManager(childProcessManager) + TranscodeService::TranscodeService() { LMS_LOG(TRANSCODING, INFO, "Service started!"); } diff --git a/src/libs/services/transcoding/impl/TranscodeService.hpp b/src/libs/services/transcoding/impl/TranscodeService.hpp index 82b86f88..9626bdfc 100644 --- a/src/libs/services/transcoding/impl/TranscodeService.hpp +++ b/src/libs/services/transcoding/impl/TranscodeService.hpp @@ -26,7 +26,7 @@ namespace lms::transcoding class TranscodeService : public ITranscodeService { public: - explicit TranscodeService(db::IDb& db, core::IChildProcessManager& childProcessManager); + explicit TranscodeService(); ~TranscodeService() override; TranscodeService(const TranscodeService&) = delete; @@ -34,8 +34,5 @@ namespace lms::transcoding private: std::unique_ptr createTranscodeResourceHandler(const audio::TranscodeParameters& parameters, bool estimateContentLength) override; - - db::IDb& _db; - core::IChildProcessManager& _childProcessManager; }; } // namespace lms::transcoding diff --git a/src/libs/services/transcoding/include/services/transcoding/ITranscodeService.hpp b/src/libs/services/transcoding/include/services/transcoding/ITranscodeService.hpp index a4def09c..b7a14df2 100644 --- a/src/libs/services/transcoding/include/services/transcoding/ITranscodeService.hpp +++ b/src/libs/services/transcoding/include/services/transcoding/ITranscodeService.hpp @@ -23,19 +23,10 @@ #include "audio/TranscodeTypes.hpp" -namespace lms +namespace lms::core { - namespace core - { - class IChildProcessManager; - class IResourceHandler; - } // namespace core - - namespace db - { - class IDb; - } -} // namespace lms + class IResourceHandler; +} // namespace lms::core namespace lms::transcoding { @@ -47,5 +38,5 @@ namespace lms::transcoding virtual std::unique_ptr createTranscodeResourceHandler(const audio::TranscodeParameters& parameters, bool estimateContentLength = false) = 0; }; - std::unique_ptr createTranscodeService(db::IDb& db, core::IChildProcessManager& childProcessManager); + std::unique_ptr createTranscodeService(); } // namespace lms::transcoding diff --git a/src/libs/subsonic/impl/endpoints/MediaRetrieval.hpp b/src/libs/subsonic/impl/endpoints/MediaRetrieval.hpp index 45da25a9..4291466c 100644 --- a/src/libs/subsonic/impl/endpoints/MediaRetrieval.hpp +++ b/src/libs/subsonic/impl/endpoints/MediaRetrieval.hpp @@ -26,7 +26,7 @@ namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response handleGetLyrics(RequestContext& context); Response handleGetLyricsBySongId(RequestContext& context); diff --git a/src/libs/subsonic/impl/responses/Album.hpp b/src/libs/subsonic/impl/responses/Album.hpp index 7af99b53..99688f4f 100644 --- a/src/libs/subsonic/impl/responses/Album.hpp +++ b/src/libs/subsonic/impl/responses/Album.hpp @@ -33,7 +33,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response::Node createAlbumNode(RequestContext& context, const db::ObjectPtr& release, bool id3, const db::ObjectPtr& directory = {}); } // namespace lms::api::subsonic \ No newline at end of file diff --git a/src/libs/subsonic/impl/responses/AlbumInfo.hpp b/src/libs/subsonic/impl/responses/AlbumInfo.hpp index fac1c759..77c90a63 100644 --- a/src/libs/subsonic/impl/responses/AlbumInfo.hpp +++ b/src/libs/subsonic/impl/responses/AlbumInfo.hpp @@ -30,7 +30,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response::Node createAlbumInfoNode(RequestContext& context, const db::ObjectPtr& release); } // namespace lms::api::subsonic \ No newline at end of file diff --git a/src/libs/subsonic/impl/responses/Artist.hpp b/src/libs/subsonic/impl/responses/Artist.hpp index 89547fc5..1ae4ec86 100644 --- a/src/libs/subsonic/impl/responses/Artist.hpp +++ b/src/libs/subsonic/impl/responses/Artist.hpp @@ -36,7 +36,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; namespace utils { diff --git a/src/libs/subsonic/impl/responses/Genre.hpp b/src/libs/subsonic/impl/responses/Genre.hpp index cc269676..cd34c9dd 100644 --- a/src/libs/subsonic/impl/responses/Genre.hpp +++ b/src/libs/subsonic/impl/responses/Genre.hpp @@ -30,7 +30,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response::Node createGenreNode(RequestContext& context, const db::ObjectPtr& cluster); } // namespace lms::api::subsonic diff --git a/src/libs/subsonic/impl/responses/Lyrics.hpp b/src/libs/subsonic/impl/responses/Lyrics.hpp index 78c2f1b4..0a7fdb67 100644 --- a/src/libs/subsonic/impl/responses/Lyrics.hpp +++ b/src/libs/subsonic/impl/responses/Lyrics.hpp @@ -30,7 +30,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response::Node createLyricsNode(RequestContext& context, const db::ObjectPtr& lyrics); Response::Node createStructuredLyricsNode(RequestContext& context, const db::ObjectPtr& lyrics); diff --git a/src/libs/subsonic/impl/responses/Playlist.hpp b/src/libs/subsonic/impl/responses/Playlist.hpp index 6c6c8e00..d4aaca07 100644 --- a/src/libs/subsonic/impl/responses/Playlist.hpp +++ b/src/libs/subsonic/impl/responses/Playlist.hpp @@ -30,7 +30,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response::Node createPlaylistNode(RequestContext& context, const db::ObjectPtr& tracklist); } // namespace lms::api::subsonic \ No newline at end of file diff --git a/src/libs/subsonic/impl/responses/Podcast.hpp b/src/libs/subsonic/impl/responses/Podcast.hpp index 51eda2c9..06cab0f6 100644 --- a/src/libs/subsonic/impl/responses/Podcast.hpp +++ b/src/libs/subsonic/impl/responses/Podcast.hpp @@ -31,7 +31,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response::Node createPodcastEpisodeNode(const db::ObjectPtr& episode); Response::Node createPodcastNode(RequestContext& context, const db::ObjectPtr& podcast, bool includeEpisodes); diff --git a/src/libs/subsonic/impl/responses/Song.hpp b/src/libs/subsonic/impl/responses/Song.hpp index 87761172..ac22ba1a 100644 --- a/src/libs/subsonic/impl/responses/Song.hpp +++ b/src/libs/subsonic/impl/responses/Song.hpp @@ -32,7 +32,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response::Node createSongNode(RequestContext& context, const db::ObjectPtr& track, bool id3); } // namespace lms::api::subsonic \ No newline at end of file diff --git a/src/libs/subsonic/impl/responses/User.hpp b/src/libs/subsonic/impl/responses/User.hpp index 6eb758a9..68bf29e6 100644 --- a/src/libs/subsonic/impl/responses/User.hpp +++ b/src/libs/subsonic/impl/responses/User.hpp @@ -30,7 +30,7 @@ namespace lms::db namespace lms::api::subsonic { - struct RequestContext; + class RequestContext; Response::Node createUserNode(RequestContext& context, const db::ObjectPtr& user); } // namespace lms::api::subsonic \ No newline at end of file diff --git a/src/lms/main.cpp b/src/lms/main.cpp index 14c149d2..7b6f40c8 100644 --- a/src/lms/main.cpp +++ b/src/lms/main.cpp @@ -428,7 +428,7 @@ namespace lms core::Service recommendationService{ recommendation::createRecommendationService(*database) }; core::Service playlistGeneratorService{ recommendation::createPlaylistGeneratorService(*database, *recommendationService) }; core::Service scannerService{ scanner::createScannerService(*database, cachePath) }; - core::Service transcodingService{ transcoding::createTranscodeService(*database, *childProcessManagerService) }; + core::Service transcodingService{ transcoding::createTranscodeService() }; core::Service podcastService{ podcast::createPodcastService(ioContext, *database, cachePath / "podcasts") }; scannerService->getEvents().scanComplete.connect([&] {