Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-24 14:40:54 +01:00
Code Issues Releases Wiki Activity

TagReaderTagLib: Remove file_mpeg argument from the SetEmbeddedArt ID3v2 overload

Browse Source
This commit is contained in:
Robert Gingras 2024-04-23 15:22:23 -04:00 committed by Jonas Kvinge
parent 8d7e14f21d
commit 9f4a82bb62
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/libstrawberry-tagreader/tagreadertaglib.cpp
View File

@ -962,7 +962,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
SetRating(tag, song); SetRating(tag, song);
} }
if (save_cover) { if (save_cover) {
SetEmbeddedArt(file_mpeg, tag, cover.data, cover.mime_type); SetEmbeddedArt(tag, cover.data, cover.mime_type);
} }
} }
@ -1002,7 +1002,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
SetRating(tag, song); SetRating(tag, song);
} }
if (save_cover) { if (save_cover) {
SetEmbeddedArt(file_mpeg, tag, cover.data, cover.mime_type); SetEmbeddedArt(tag, cover.data, cover.mime_type);
} }
} }
} }
@ -1313,9 +1313,7 @@ void TagReaderTagLib::SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, con
} }
void TagReaderTagLib::SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const { void TagReaderTagLib::SetEmbeddedArt(TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const {
(void)file_mp3;
// Remove existing covers // Remove existing covers
TagLib::ID3v2::FrameList apiclist = tag->frameListMap()["APIC"]; TagLib::ID3v2::FrameList apiclist = tag->frameListMap()["APIC"];
@ -1395,7 +1393,7 @@ bool TagReaderTagLib::SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtReque
else if (TagLib::MPEG::File *file_mp3 = dynamic_cast<TagLib::MPEG::File*>(fileref.file())) { else if (TagLib::MPEG::File *file_mp3 = dynamic_cast<TagLib::MPEG::File*>(fileref.file())) {
TagLib::ID3v2::Tag *tag = file_mp3->ID3v2Tag(); TagLib::ID3v2::Tag *tag = file_mp3->ID3v2Tag();
if (!tag) return false; if (!tag) return false;
SetEmbeddedArt(file_mp3, tag, cover.data, cover.mime_type); SetEmbeddedArt(tag, cover.data, cover.mime_type);
} }
// MP4/AAC // MP4/AAC

2
ext/libstrawberry-tagreader/tagreadertaglib.h
View File

@ -100,7 +100,7 @@ class TagReaderTagLib : public TagReaderBase {
void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const; void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const;
void SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const; void SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const;
void SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const; void SetEmbeddedArt(TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const;
void SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mime_type) const; void SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mime_type) const;
private: private: