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

Remove duplication

Browse Source
This commit is contained in:
craig.p.drummond
2014-05-07 18:53:00 +00:00
committed by craig.p.drummond
parent 01046be8e3
commit 9cdf5e7727
2 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
models/albumsmodel.cpp
View File

@@ -707,18 +707,8 @@ void AlbumsModel::AlbumItem::updateStats()
QString AlbumsModel::AlbumItem::cover()
{
if (Song::SingleTracks!=type && songs.count() && coverFile.isEmpty() && !coverRequested) {
SongItem *firstSong=songs.first();
coverSong.artist=firstSong->artist;
coverSong.albumartist=Song::useComposer() && !firstSong->composer.isEmpty()
? firstSong->albumArtist() : artist;
coverSong.album=album;
coverSong.year=year;
coverSong.file=firstSong->file;
coverSong.type=type;
coverSong.composer=firstSong->composer;
coverSong.mbAlbumId=firstSong->mbAlbumId;
coverRequested=true;
coverFile=Covers::self()->requestImage(coverSong).fileName;
coverFile=Covers::self()->requestImage(coverSong()).fileName;
if (!coverFile.isEmpty()) {
coverRequested=false;
coverFile="file://"+coverFile;
@@ -731,25 +721,29 @@ QString AlbumsModel::AlbumItem::cover()
QPixmap * AlbumsModel::AlbumItem::cover()
{
if (Song::SingleTracks!=type && songs.count()) {
if (coverSong.isEmpty()) {
SongItem *firstSong=songs.first();
coverSong.artist=firstSong->artist;
coverSong.albumartist=Song::useComposer() && !firstSong->composer.isEmpty()
? firstSong->albumArtist() : artist;
coverSong.album=album;
coverSong.year=year;
coverSong.file=firstSong->file;
coverSong.type=type;
coverSong.composer=firstSong->composer;
coverSong.mbAlbumId=firstSong->mbAlbumId;
}
return Covers::self()->get(coverSong, iconSize());
return Covers::self()->get(coverSong(), iconSize());
}
return 0;
}
#endif
const Song & AlbumsModel::AlbumItem::coverSong()
{
if (cSong.isEmpty() && songs.count()) {
SongItem *firstSong=songs.first();
cSong.artist=firstSong->artist;
cSong.albumartist=Song::useComposer() && !firstSong->composer.isEmpty()
? firstSong->albumArtist() : artist;
cSong.album=album;
cSong.year=year;
cSong.file=firstSong->file;
cSong.type=type;
cSong.composer=firstSong->composer;
cSong.mbAlbumId=firstSong->mbAlbumId;
}
return cSong;
}
const AlbumsModel::SongItem *AlbumsModel::AlbumItem::getCueFile() const
{
foreach (SongItem *s, songs) {

3
models/albumsmodel.h
View File

@@ -103,6 +103,7 @@ public:
QString albumDisplay() const { return Song::displayAlbum(album, year); }
const QString & sortArtist() const { return nonTheArtist.isEmpty() ? artist : nonTheArtist; }
const QString & albumId() const { return id.isEmpty() ? album : id; }
const Song & coverSong();
QString artist;
QString nonTheArtist;
QString album;
@@ -114,7 +115,7 @@ public:
Song::Type type;
quint32 numTracks;
quint32 time;
Song coverSong;
Song cSong;
bool isNew;
#ifdef ENABLE_UBUNTU
QString coverFile;