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

Always pass size and count parameters, init to defaults

Browse Source
This commit is contained in:
Nick Lanham 2015-12-07 11:00:03 -08:00
parent da537d9a4b
commit 8dc6563718
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/internet/subsonic/subsonicdynamicplaylist.cpp
View File

@ -39,11 +39,11 @@ const int SubsonicDynamicPlaylist::kDefaultCount = 10;
const int SubsonicDynamicPlaylist::kDefaultOffset = 0; const int SubsonicDynamicPlaylist::kDefaultOffset = 0;
SubsonicDynamicPlaylist::SubsonicDynamicPlaylist() SubsonicDynamicPlaylist::SubsonicDynamicPlaylist()
: stat_(QueryStat_Newest), offset_(0) {} : stat_(QueryStat_Newest), offset_(kDefaultOffset) {}
SubsonicDynamicPlaylist::SubsonicDynamicPlaylist(const QString& name, SubsonicDynamicPlaylist::SubsonicDynamicPlaylist(const QString& name,
QueryStat stat) QueryStat stat)
: stat_(stat), offset_(0) { : stat_(stat), offset_(kDefaultOffset) {
set_name(name); set_name(name);
} }
@ -79,7 +79,7 @@ QNetworkReply* SubsonicDynamicPlaylist::Send(QNetworkAccessManager& network,
} }
PlaylistItemList SubsonicDynamicPlaylist::Generate() { PlaylistItemList SubsonicDynamicPlaylist::Generate() {
return GenerateMore(10); return GenerateMore(kDefaultCount);
} }
PlaylistItemList SubsonicDynamicPlaylist::GenerateMore(int count) { PlaylistItemList SubsonicDynamicPlaylist::GenerateMore(int count) {
@ -96,16 +96,11 @@ PlaylistItemList SubsonicDynamicPlaylist::GenerateMore(int count) {
QUrl url = service->BuildRequestUrl("GetAlbumList"); QUrl url = service->BuildRequestUrl("GetAlbumList");
QNetworkAccessManager network; QNetworkAccessManager network;
url.addQueryItem("type", GetTypeString());
if (count > kMaxCount) count = kMaxCount; if (count > kMaxCount) count = kMaxCount;
if (count != kDefaultCount) {
url.addQueryItem("size", QString::number(count));
}
if (offset_ != kDefaultOffset) { url.addQueryItem("type", GetTypeString());
url.addQueryItem("offset", QString::number(offset_)); url.addQueryItem("size", QString::number(count));
} url.addQueryItem("offset", QString::number(offset_));
PlaylistItemList items; PlaylistItemList items;