mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 11:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix xiph album art extraction.

Browse Source
This commit is contained in:
casey langen 2022-07-19 19:27:06 -07:00
parent dafa0bb713
commit f311ad4de7
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.txt
View File

@ -1,4 +1,10 @@
0.98
0.98.1
* fixed album art extraction for xiph comments.
--------------------------------------------------------------------------------
0.98.0
* added the ability to click the browse and tracklist headers to change filter
options

34
src/plugins/taglib_plugin/TaglibMetadataReader.cpp
View File

@ -225,6 +225,18 @@ static inline bool replayGainValid(ReplayGain& rg) {
rg.trackGain != 1.0 || rg.trackPeak != 1.0;
}
static inline void processAlbumArt(TagLib::List<TagLib::FLAC::Picture*> pictures, ITagStore* target) {
for (auto picture : pictures) {
if (picture->type() == TagLib::FLAC::Picture::FrontCover) {
auto byteVector = picture->data();
if (byteVector.size()) {
target->SetThumbnail(byteVector.data(), byteVector.size());
}
break;
}
}
}
TaglibMetadataReader::TaglibMetadataReader() {
}
@ -337,6 +349,7 @@ bool TaglibMetadataReader::ReadGeneric(
field list. if we're dealing with a straight-up Xiph tag, process it now */
const auto xiphTag = dynamic_cast<TagLib::Ogg::XiphComment*>(tag);
if (xiphTag) {
processAlbumArt(xiphTag->pictureList(), target);
this->ReadFromMap(xiphTag->fieldListMap(), target);
this->ExtractReplayGain(xiphTag->fieldListMap(), target);
}
@ -347,25 +360,16 @@ bool TaglibMetadataReader::ReadGeneric(
bool handled = false;
/* flac files may have more than one type of tag embedded. see if there's
see if there's a xiph comment burried deep. */
see if there's a xiph comment buried deep. */
auto flacFile = dynamic_cast<TagLib::FLAC::File*>(file.file());
if (flacFile) {
auto pictures = flacFile->pictureList();
for (auto picture : pictures) {
if (picture->type() == TagLib::FLAC::Picture::FrontCover) {
auto byteVector = picture->data();
if (byteVector.size()) {
target->SetThumbnail(byteVector.data(), byteVector.size());
}
break;
}
processAlbumArt(flacFile->pictureList(), target);
if (flacFile->hasXiphComment()) {
this->ReadFromMap(flacFile->xiphComment()->fieldListMap(), target);
this->ExtractReplayGain(flacFile->xiphComment()->fieldListMap(), target);
handled = true;
}
}
if (flacFile && flacFile->hasXiphComment()) {
this->ReadFromMap(flacFile->xiphComment()->fieldListMap(), target);
this->ExtractReplayGain(flacFile->xiphComment()->fieldListMap(), target);
handled = true;
}
/* similarly, mp4 buries disc number and album artist. however, taglib does
NOT exposed a map with normalized keys, so we have to do special property