Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually, I was wrong modifying UniqueResults. We should just not sort the results at the end, to keep the initial order we wanted

Browse Source
This commit is contained in:
Arnaud Bienner 2014-08-10 13:20:11 +02:00
parent 93b4b2caac
commit bc7bc9910d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/musicbrainz/musicbrainzclient.cpp
View File

@ -142,7 +142,9 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString& discid,
}
}
emit Finished(artist, album, UniqueResults(ret));
ResultList unique_ret = UniqueResults(ret);
qSort(unique_ret);
emit Finished(artist, album, unique_ret);
}
void MusicBrainzClient::RequestFinished(QNetworkReply* reply, int id, int request_number) {
@ -345,8 +347,7 @@ MusicBrainzClient::Release MusicBrainzClient::ParseRelease(
return ret;
}
MusicBrainzClient::ResultList& MusicBrainzClient::UniqueResults(ResultList& results) {
qStableSort(results);
results.erase(std::unique(results.begin(), results.end()), results.end());
return results;
MusicBrainzClient::ResultList MusicBrainzClient::UniqueResults(const ResultList& results) {
ResultList ret = QSet<Result>::fromList(results).toList();
return ret;
}

3
src/musicbrainz/musicbrainzclient.h
View File

@ -137,8 +137,7 @@ signals:
static ResultList ParseTrack(QXmlStreamReader* reader);
static void ParseArtist(QXmlStreamReader* reader, QString* artist);
static Release ParseRelease(QXmlStreamReader* reader);
// Remove duplicate from the list. Returns a reference to the input parameter
static ResultList& UniqueResults(ResultList& results);
static ResultList UniqueResults(const ResultList& results);
private:
static const char* kTrackUrl;