Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Uses effective fields for album hashing and comparison (#5653)

This commit is contained in:
Jan Paul Erkelens 2017-03-08 07:22:50 -05:00 committed by John Maguire
parent 62bc647cbc
commit 0215707810
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/song.cpp
View File

@ -1127,12 +1127,13 @@ bool Song::IsOnSameAlbum(const Song& other) const {
if (is_compilation() && album() == other.album()) return true; if (is_compilation() && album() == other.album()) return true;
return album() == other.album() && artist() == other.artist(); return effective_album() == other.effective_album() &&
effective_albumartist() == other.effective_albumartist();
} }
QString Song::AlbumKey() const { QString Song::AlbumKey() const {
return QString("%1|%2|%3").arg(is_compilation() ? "_compilation" : artist(), return QString("%1|%2|%3").arg(is_compilation() ? "_compilation" : effective_albumartist(),
has_cue() ? cue_path() : "", album()); has_cue() ? cue_path() : "", effective_album());
} }
void Song::ToXesam(QVariantMap* map) const { void Song::ToXesam(QVariantMap* map) const {