Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display album art from FLAC tags

Browse Source
This commit is contained in:
Casey Jones 2011-09-28 00:16:02 +01:00 committed by David Sansome
parent 53e175e503
commit a49e2828e6
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/song.cpp
View File

@ -74,6 +74,13 @@ using boost::scoped_ptr;
#include "library/sqlrow.h" #include "library/sqlrow.h"
#include "widgets/trackslider.h" #include "widgets/trackslider.h"
// Taglib added support for FLAC pictures in 1.7.0
#if (TAGLIB_MAJOR_VERSION > 1) || (TAGLIB_MAJOR_VERSION == 1 && TAGLIB_MINOR_VERSION >= 7)
# define TAGLIB_HAS_FLAC_PICTURELIST
#endif
static QStringList Prepend(const QString& text, const QStringList& list) { static QStringList Prepend(const QString& text, const QStringList& list) {
QStringList ret(list); QStringList ret(list);
for (int i=0 ; i<ret.count() ; ++i) for (int i=0 ; i<ret.count() ; ++i)
@ -368,6 +375,11 @@ void Song::InitFromFile(const QString& filename, int directory_id) {
} else if (TagLib::FLAC::File* file = dynamic_cast<TagLib::FLAC::File*>(fileref->file())) { } else if (TagLib::FLAC::File* file = dynamic_cast<TagLib::FLAC::File*>(fileref->file())) {
if ( file->xiphComment() ) { if ( file->xiphComment() ) {
ParseOggTag(file->xiphComment()->fieldListMap(), NULL, &disc, &compilation); ParseOggTag(file->xiphComment()->fieldListMap(), NULL, &disc, &compilation);
#ifdef TAGLIB_HAS_FLAC_PICTURELIST
if (!file->pictureList().isEmpty()) {
set_embedded_cover();
}
#endif
} }
d->comment_ = Decode(tag->comment()); d->comment_ = Decode(tag->comment());
} else if (TagLib::MP4::File* file = dynamic_cast<TagLib::MP4::File*>(fileref->file())) { } else if (TagLib::MP4::File* file = dynamic_cast<TagLib::MP4::File*>(fileref->file())) {
@ -1290,7 +1302,7 @@ QImage Song::LoadEmbeddedArt(const QString& filename) {
return ret; return ret;
} }
// Ogg vorbis/flac/speex // Ogg vorbis/speex
TagLib::Ogg::XiphComment* xiph_comment = TagLib::Ogg::XiphComment* xiph_comment =
dynamic_cast<TagLib::Ogg::XiphComment*>(ref.file()->tag()); dynamic_cast<TagLib::Ogg::XiphComment*>(ref.file()->tag());
@ -1307,8 +1319,29 @@ QImage Song::LoadEmbeddedArt(const QString& filename) {
if (!ret.loadFromData(image_data)) if (!ret.loadFromData(image_data))
ret.loadFromData(image_data_b64); //maybe it's not b64 after all ret.loadFromData(image_data_b64); //maybe it's not b64 after all
}
return ret;
}
#ifdef TAGLIB_HAS_FLAC_PICTURELIST
// Flac
TagLib::FLAC::File* flac_file = dynamic_cast<TagLib::FLAC::File*>(ref.file());
if (flac_file && flac_file->xiphComment()) {
TagLib::List<TagLib::FLAC::Picture*> pics = flac_file->pictureList();
if (!pics.isEmpty()) {
// Use the first picture in the file - this could be made cleverer and
// pick the front cover if it's present.
std::list<TagLib::FLAC::Picture*>::iterator it = pics.begin();
TagLib::FLAC::Picture* picture = *it;
QByteArray image_data(picture->data().data(), picture->data().size());
ret.loadFromData(image_data);
return ret;
}
}
#endif
return ret; return ret;
} }