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

When determining album year, ignore playlist files!

Browse Source
This commit is contained in:
craig.p.drummond
2014-04-03 18:59:07 +00:00
parent de3c6ec004
commit 6441bc6101
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -112,6 +112,7 @@
zero.
11. In tag-editor, when onbtaining values to use for 'All Tracks' entry, don't
ignore empty fields.
12. When determining album year, ignore playlist files!
1.3.3
-----

15
models/musiclibraryitemalbum.cpp
View File

@@ -372,9 +372,15 @@ bool MusicLibraryItemAlbum::updateYear()
{
quint32 currentYear=m_year;
foreach (MusicLibraryItem *track, m_childItems) {
m_year=static_cast<MusicLibraryItemSong*>(track)->song().year;
if (m_year==currentYear) {
return false;
MusicLibraryItemSong *song=static_cast<MusicLibraryItemSong*>(track);
if (Song::Playlist!=song->song().type) {
m_year=song->song().year;
// Store which track/disc we obtained the year from!
m_yearOfTrack=song->track();
m_yearOfDisc=song->disc();
if (m_year==currentYear) {
return false;
}
}
}
return true;
@@ -393,7 +399,8 @@ bool MusicLibraryItemAlbum::containsArtist(const QString &a)
void MusicLibraryItemAlbum::setYear(const MusicLibraryItemSong *song)
{
if (m_childItems.isEmpty() || (m_yearOfDisc>song->disc() || (m_yearOfDisc==song->disc() && m_yearOfTrack>song->track()))) {
if (Song::Playlist!=song->song().type &&
(m_childItems.isEmpty() || (m_yearOfDisc>song->disc() || (m_yearOfDisc==song->disc() && m_yearOfTrack>song->track())))) {
m_year=song->song().year;
// Store which track/disc we obtained the year from!
m_yearOfTrack=song->track();