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

Fix some missing reply->deleteLater() in grooveshark service

This commit is contained in:
Arnaud Bienner 2012-03-08 21:26:27 +01:00
parent d09f96d6eb
commit c2a4ca2cf8
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/internet/groovesharkservice.cpp
View File

@ -292,10 +292,10 @@ void GroovesharkService::InitCountry() {
return; return;
// Get country info // Get country info
QNetworkReply *reply_country = CreateRequest("getCountry", QList<Param>()); QNetworkReply *reply_country = CreateRequest("getCountry", QList<Param>());
if (!WaitForReply(reply_country)) if (WaitForReply(reply_country)) {
return; country_ = ExtractResult(reply_country);
}
country_ = ExtractResult(reply_country); reply_country->deleteLater();
} }
QUrl GroovesharkService::GetStreamingUrlFromSongId(const QString& song_id, const QString& artist_id, QUrl GroovesharkService::GetStreamingUrlFromSongId(const QString& song_id, const QString& artist_id,
@ -306,8 +306,13 @@ QUrl GroovesharkService::GetStreamingUrlFromSongId(const QString& song_id, const
parameters << Param("songID", song_id) parameters << Param("songID", song_id)
<< Param("country", country_); << Param("country", country_);
QNetworkReply* reply = CreateRequest("getSubscriberStreamKey", parameters); QNetworkReply* reply = CreateRequest("getSubscriberStreamKey", parameters);
if (!WaitForReply(reply))
// Wait for the reply
bool reply_has_timeouted = !WaitForReply(reply);
reply->deleteLater();
if (reply_has_timeouted)
return QUrl(); return QUrl();
QVariantMap result = ExtractResult(reply); QVariantMap result = ExtractResult(reply);
server_id->clear(); server_id->clear();
server_id->append(result["StreamServerID"].toString()); server_id->append(result["StreamServerID"].toString());
@ -821,9 +826,12 @@ Song GroovesharkService::StartAutoplayTag(int tag_id, QVariantMap& autoplay_stat
QList<Param> parameters; QList<Param> parameters;
parameters << Param("tagID", tag_id); parameters << Param("tagID", tag_id);
QNetworkReply* reply = CreateRequest("startAutoplayTag", parameters); QNetworkReply* reply = CreateRequest("startAutoplayTag", parameters);
if (!WaitForReply(reply))
return Song(); bool reply_has_timeouted = !WaitForReply(reply);
reply->deleteLater(); reply->deleteLater();
if (reply_has_timeouted)
return Song();
QVariantMap result = ExtractResult(reply); QVariantMap result = ExtractResult(reply);
autoplay_state = result["autoplayState"].toMap(); autoplay_state = result["autoplayState"].toMap();
return ExtractSong(result["nextSong"].toMap()); return ExtractSong(result["nextSong"].toMap());
@ -842,9 +850,12 @@ Song GroovesharkService::StartAutoplay(QVariantMap& autoplay_state) {
parameters << Param("artistIDs", artists_ids_qvariant) parameters << Param("artistIDs", artists_ids_qvariant)
<< Param("songIDs", songs_ids_qvariant); << Param("songIDs", songs_ids_qvariant);
QNetworkReply* reply = CreateRequest("startAutoplay", parameters); QNetworkReply* reply = CreateRequest("startAutoplay", parameters);
if (!WaitForReply(reply))
return Song(); bool reply_has_timeouted = !WaitForReply(reply);
reply->deleteLater(); reply->deleteLater();
if (reply_has_timeouted)
return Song();
QVariantMap result = ExtractResult(reply); QVariantMap result = ExtractResult(reply);
autoplay_state = result["autoplayState"].toMap(); autoplay_state = result["autoplayState"].toMap();
return ExtractSong(result["nextSong"].toMap()); return ExtractSong(result["nextSong"].toMap());
@ -854,9 +865,12 @@ Song GroovesharkService::GetAutoplaySong(QVariantMap& autoplay_state) {
QList<Param> parameters; QList<Param> parameters;
parameters << Param("autoplayState", autoplay_state); parameters << Param("autoplayState", autoplay_state);
QNetworkReply* reply = CreateRequest("getAutoplaySong", parameters); QNetworkReply* reply = CreateRequest("getAutoplaySong", parameters);
if (!WaitForReply(reply))
return Song(); bool reply_has_timeouted = !WaitForReply(reply);
reply->deleteLater(); reply->deleteLater();
if (reply_has_timeouted)
return Song();
QVariantMap result = ExtractResult(reply); QVariantMap result = ExtractResult(reply);
autoplay_state = result["autoplayState"].toMap(); autoplay_state = result["autoplayState"].toMap();
return ExtractSong(result["nextSong"].toMap()); return ExtractSong(result["nextSong"].toMap());