Merge 900e2a46bd
into fbb266adc2
This commit is contained in:
commit
744e2a491b
|
@ -1138,13 +1138,13 @@ uint qHash(const Song& song) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Song::IsSimilar(const Song& other) const {
|
bool Song::IsSimilar(const Song& other) const {
|
||||||
return title().compare(other.title(), Qt::CaseInsensitive) == 0 &&
|
return basefilename().compare(other.basefilename(), Qt::CaseInsensitive) == 0 &&
|
||||||
artist().compare(other.artist(), Qt::CaseInsensitive) == 0;
|
artist().compare(other.artist(), Qt::CaseInsensitive) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint HashSimilar(const Song& song) {
|
uint HashSimilar(const Song& song) {
|
||||||
// Should compare the same fields as function IsSimilar
|
// Should compare the same fields as function IsSimilar
|
||||||
return qHash(song.title().toLower()) ^ qHash(song.artist().toLower());
|
return qHash(song.basefilename().toLower()) ^ qHash(song.artist().toLower());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Song::IsOnSameAlbum(const Song& other) const {
|
bool Song::IsOnSameAlbum(const Song& other) const {
|
||||||
|
|
Loading…
Reference in New Issue