Fixed various warnings
This commit is contained in:
@@ -144,8 +144,7 @@ namespace lms::audio::ffmpeg
|
|||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
TagReader::TagReader(const AudioFile& audioFile, bool enableExtraDebugLogs)
|
TagReader::TagReader(const AudioFile& audioFile, bool enableExtraDebugLogs)
|
||||||
: _audioFile{ audioFile }
|
: _metaDataMap{ audioFile.extractMetaData() }
|
||||||
, _metaDataMap{ audioFile.extractMetaData() }
|
|
||||||
{
|
{
|
||||||
if (enableExtraDebugLogs && core::Service<core::logging::ILogger>::get()->isSeverityActive(core::logging::Severity::DEBUG))
|
if (enableExtraDebugLogs && core::Service<core::logging::ILogger>::get()->isSeverityActive(core::logging::Severity::DEBUG))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ namespace lms::audio::ffmpeg
|
|||||||
void visitPerformerTags(PerformerVisitor visitor) const override;
|
void visitPerformerTags(PerformerVisitor visitor) const override;
|
||||||
void visitLyricsTags(LyricsVisitor visitor) const override;
|
void visitLyricsTags(LyricsVisitor visitor) const override;
|
||||||
|
|
||||||
const AudioFile& _audioFile;
|
|
||||||
AudioFile::MetadataMap _metaDataMap;
|
AudioFile::MetadataMap _metaDataMap;
|
||||||
};
|
};
|
||||||
} // namespace lms::audio::ffmpeg
|
} // namespace lms::audio::ffmpeg
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
namespace lms::audio
|
namespace lms::audio
|
||||||
{
|
{
|
||||||
class AudioProperties;
|
struct AudioProperties;
|
||||||
class IImageReader;
|
class IImageReader;
|
||||||
class ITagReader;
|
class ITagReader;
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::scanner
|
namespace lms::scanner
|
||||||
{
|
{
|
||||||
class AudioFileInfoParserSet;
|
struct AudioFileInfoParserSet;
|
||||||
class TrackMetadataParser;
|
class TrackMetadataParser;
|
||||||
|
|
||||||
struct ImageInfo
|
struct ImageInfo
|
||||||
|
|||||||
@@ -34,14 +34,12 @@ namespace lms::transcoding
|
|||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
std::unique_ptr<ITranscodeService> createTranscodeService(db::IDb& db, core::IChildProcessManager& childProcessManager)
|
std::unique_ptr<ITranscodeService> createTranscodeService()
|
||||||
{
|
{
|
||||||
return std::make_unique<TranscodeService>(db, childProcessManager);
|
return std::make_unique<TranscodeService>();
|
||||||
}
|
}
|
||||||
|
|
||||||
TranscodeService::TranscodeService(db::IDb& db, core::IChildProcessManager& childProcessManager)
|
TranscodeService::TranscodeService()
|
||||||
: _db{ db }
|
|
||||||
, _childProcessManager(childProcessManager)
|
|
||||||
{
|
{
|
||||||
LMS_LOG(TRANSCODING, INFO, "Service started!");
|
LMS_LOG(TRANSCODING, INFO, "Service started!");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ namespace lms::transcoding
|
|||||||
class TranscodeService : public ITranscodeService
|
class TranscodeService : public ITranscodeService
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit TranscodeService(db::IDb& db, core::IChildProcessManager& childProcessManager);
|
explicit TranscodeService();
|
||||||
~TranscodeService() override;
|
~TranscodeService() override;
|
||||||
|
|
||||||
TranscodeService(const TranscodeService&) = delete;
|
TranscodeService(const TranscodeService&) = delete;
|
||||||
@@ -34,8 +34,5 @@ namespace lms::transcoding
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<core::IResourceHandler> createTranscodeResourceHandler(const audio::TranscodeParameters& parameters, bool estimateContentLength) override;
|
std::unique_ptr<core::IResourceHandler> createTranscodeResourceHandler(const audio::TranscodeParameters& parameters, bool estimateContentLength) override;
|
||||||
|
|
||||||
db::IDb& _db;
|
|
||||||
core::IChildProcessManager& _childProcessManager;
|
|
||||||
};
|
};
|
||||||
} // namespace lms::transcoding
|
} // namespace lms::transcoding
|
||||||
|
|||||||
@@ -23,19 +23,10 @@
|
|||||||
|
|
||||||
#include "audio/TranscodeTypes.hpp"
|
#include "audio/TranscodeTypes.hpp"
|
||||||
|
|
||||||
namespace lms
|
namespace lms::core
|
||||||
{
|
{
|
||||||
namespace core
|
class IResourceHandler;
|
||||||
{
|
} // namespace lms::core
|
||||||
class IChildProcessManager;
|
|
||||||
class IResourceHandler;
|
|
||||||
} // namespace core
|
|
||||||
|
|
||||||
namespace db
|
|
||||||
{
|
|
||||||
class IDb;
|
|
||||||
}
|
|
||||||
} // namespace lms
|
|
||||||
|
|
||||||
namespace lms::transcoding
|
namespace lms::transcoding
|
||||||
{
|
{
|
||||||
@@ -47,5 +38,5 @@ namespace lms::transcoding
|
|||||||
virtual std::unique_ptr<core::IResourceHandler> createTranscodeResourceHandler(const audio::TranscodeParameters& parameters, bool estimateContentLength = false) = 0;
|
virtual std::unique_ptr<core::IResourceHandler> createTranscodeResourceHandler(const audio::TranscodeParameters& parameters, bool estimateContentLength = false) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::unique_ptr<ITranscodeService> createTranscodeService(db::IDb& db, core::IChildProcessManager& childProcessManager);
|
std::unique_ptr<ITranscodeService> createTranscodeService();
|
||||||
} // namespace lms::transcoding
|
} // namespace lms::transcoding
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response handleGetLyrics(RequestContext& context);
|
Response handleGetLyrics(RequestContext& context);
|
||||||
Response handleGetLyricsBySongId(RequestContext& context);
|
Response handleGetLyricsBySongId(RequestContext& context);
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response::Node createAlbumNode(RequestContext& context, const db::ObjectPtr<db::Release>& release, bool id3, const db::ObjectPtr<db::Directory>& directory = {});
|
Response::Node createAlbumNode(RequestContext& context, const db::ObjectPtr<db::Release>& release, bool id3, const db::ObjectPtr<db::Directory>& directory = {});
|
||||||
} // namespace lms::api::subsonic
|
} // namespace lms::api::subsonic
|
||||||
@@ -30,7 +30,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response::Node createAlbumInfoNode(RequestContext& context, const db::ObjectPtr<db::Release>& release);
|
Response::Node createAlbumInfoNode(RequestContext& context, const db::ObjectPtr<db::Release>& release);
|
||||||
} // namespace lms::api::subsonic
|
} // namespace lms::api::subsonic
|
||||||
@@ -36,7 +36,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
namespace utils
|
namespace utils
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response::Node createGenreNode(RequestContext& context, const db::ObjectPtr<db::Cluster>& cluster);
|
Response::Node createGenreNode(RequestContext& context, const db::ObjectPtr<db::Cluster>& cluster);
|
||||||
} // namespace lms::api::subsonic
|
} // namespace lms::api::subsonic
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response::Node createLyricsNode(RequestContext& context, const db::ObjectPtr<db::TrackLyrics>& lyrics);
|
Response::Node createLyricsNode(RequestContext& context, const db::ObjectPtr<db::TrackLyrics>& lyrics);
|
||||||
Response::Node createStructuredLyricsNode(RequestContext& context, const db::ObjectPtr<db::TrackLyrics>& lyrics);
|
Response::Node createStructuredLyricsNode(RequestContext& context, const db::ObjectPtr<db::TrackLyrics>& lyrics);
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response::Node createPlaylistNode(RequestContext& context, const db::ObjectPtr<db::TrackList>& tracklist);
|
Response::Node createPlaylistNode(RequestContext& context, const db::ObjectPtr<db::TrackList>& tracklist);
|
||||||
} // namespace lms::api::subsonic
|
} // namespace lms::api::subsonic
|
||||||
@@ -31,7 +31,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response::Node createPodcastEpisodeNode(const db::ObjectPtr<db::PodcastEpisode>& episode);
|
Response::Node createPodcastEpisodeNode(const db::ObjectPtr<db::PodcastEpisode>& episode);
|
||||||
Response::Node createPodcastNode(RequestContext& context, const db::ObjectPtr<db::Podcast>& podcast, bool includeEpisodes);
|
Response::Node createPodcastNode(RequestContext& context, const db::ObjectPtr<db::Podcast>& podcast, bool includeEpisodes);
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response::Node createSongNode(RequestContext& context, const db::ObjectPtr<db::Track>& track, bool id3);
|
Response::Node createSongNode(RequestContext& context, const db::ObjectPtr<db::Track>& track, bool id3);
|
||||||
} // namespace lms::api::subsonic
|
} // namespace lms::api::subsonic
|
||||||
@@ -30,7 +30,7 @@ namespace lms::db
|
|||||||
|
|
||||||
namespace lms::api::subsonic
|
namespace lms::api::subsonic
|
||||||
{
|
{
|
||||||
struct RequestContext;
|
class RequestContext;
|
||||||
|
|
||||||
Response::Node createUserNode(RequestContext& context, const db::ObjectPtr<db::User>& user);
|
Response::Node createUserNode(RequestContext& context, const db::ObjectPtr<db::User>& user);
|
||||||
} // namespace lms::api::subsonic
|
} // namespace lms::api::subsonic
|
||||||
+1
-1
@@ -428,7 +428,7 @@ namespace lms
|
|||||||
core::Service<recommendation::IRecommendationService> recommendationService{ recommendation::createRecommendationService(*database) };
|
core::Service<recommendation::IRecommendationService> recommendationService{ recommendation::createRecommendationService(*database) };
|
||||||
core::Service<recommendation::IPlaylistGeneratorService> playlistGeneratorService{ recommendation::createPlaylistGeneratorService(*database, *recommendationService) };
|
core::Service<recommendation::IPlaylistGeneratorService> playlistGeneratorService{ recommendation::createPlaylistGeneratorService(*database, *recommendationService) };
|
||||||
core::Service<scanner::IScannerService> scannerService{ scanner::createScannerService(*database, cachePath) };
|
core::Service<scanner::IScannerService> scannerService{ scanner::createScannerService(*database, cachePath) };
|
||||||
core::Service<transcoding::ITranscodeService> transcodingService{ transcoding::createTranscodeService(*database, *childProcessManagerService) };
|
core::Service<transcoding::ITranscodeService> transcodingService{ transcoding::createTranscodeService() };
|
||||||
core::Service<podcast::IPodcastService> podcastService{ podcast::createPodcastService(ioContext, *database, cachePath / "podcasts") };
|
core::Service<podcast::IPodcastService> podcastService{ podcast::createPodcastService(ioContext, *database, cachePath / "podcasts") };
|
||||||
|
|
||||||
scannerService->getEvents().scanComplete.connect([&] {
|
scannerService->getEvents().scanComplete.connect([&] {
|
||||||
|
|||||||
Reference in New Issue
Block a user