iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert back to storing scaled covers as JPG. PNG is taking too much space, especially with retina displays.

Browse Source
This commit is contained in:
craig.p.drummond
2014-09-19 17:14:01 +00:00
committed by craig.p.drummond
parent 912a12f859
commit 42348816a7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/covers.cpp
View File

@@ -236,7 +236,7 @@ static inline QString cacheKey(const Song &song, int size)
return (song.isArtistImageRequest() ? artistKey(song) : albumKey(song))+QString::number(size);
}
static const QLatin1String constScaledFormat(".png");
static const QLatin1String constScaledFormat(".jpg");
static bool cacheScaledCovers=true;
static QString getScaledCoverName(const Song &song, int size, bool createDir)
@@ -295,13 +295,13 @@ static QImage loadScaledCover(const Song &song, int size)
QString fileName=getScaledCoverName(song, size, false);
if (!fileName.isEmpty()) {
if (QFile::exists(fileName)) {
QImage img(fileName, "PNG");
QImage img(fileName, "JPG");
if (!img.isNull() && (img.width()==size || img.height()==size)) {
DBUG_CLASS("Covers") << song.albumArtist() << song.albumId() << size << "scaled cover found" << fileName;
return img;
}
} else { // Remove any previous JPG scaled cover...
fileName=Utils::changeExtension(fileName, ".jpg");
} else { // Remove any previous PNG scaled cover...
fileName=Utils::changeExtension(fileName, ".png");
if (QFile::exists(fileName)) {
QFile::remove(fileName);
}
@@ -1131,7 +1131,7 @@ QPixmap * Covers::saveScaledCover(const QImage &img, const Song &song, int size)
if (cacheScaledCovers && !isOnlineServiceImage(song)) {
QString fileName=getScaledCoverName(song, size, true);
bool status=img.save(fileName, "PNG");
bool status=img.save(fileName, "JPG");
DBUG_CLASS("Covers") << song.albumArtist() << song.album << song.mbAlbumId() << size << fileName << status;
}
QPixmap *pix=new QPixmap(QPixmap::fromImage(img));