Removed default value for the parameter original_url in the UrlHandler::LoadResult() constructor and updated internet services according to this.
This commit is contained in:
parent
ae99716d9f
commit
eb8fad766f
|
@ -52,7 +52,7 @@ class UrlHandler : public QObject {
|
|||
TrackAvailable,
|
||||
};
|
||||
|
||||
LoadResult(const QUrl& original_url = QUrl(), Type type = NoMoreTracks,
|
||||
LoadResult(const QUrl& original_url, Type type = NoMoreTracks,
|
||||
const QUrl& media_url = QUrl(), qint64 length_nanosec_ = -1);
|
||||
|
||||
// The url that the playlist item has in Url().
|
||||
|
|
|
@ -26,7 +26,7 @@ SubsonicUrlHandler::SubsonicUrlHandler(SubsonicService* service,
|
|||
|
||||
UrlHandler::LoadResult SubsonicUrlHandler::StartLoading(const QUrl& url) {
|
||||
if (service_->login_state() != SubsonicService::LoginState_Loggedin)
|
||||
return LoadResult();
|
||||
return LoadResult(url);
|
||||
|
||||
QUrl newurl = service_->BuildRequestUrl("stream");
|
||||
newurl.addQueryItem("id", url.host());
|
||||
|
|
|
@ -1196,14 +1196,14 @@ UrlHandler::LoadResult VkService::GetSongResult(const QUrl& url) {
|
|||
media_url, song.length_nanosec());
|
||||
}
|
||||
|
||||
return UrlHandler::LoadResult();
|
||||
return UrlHandler::LoadResult(url);
|
||||
}
|
||||
|
||||
UrlHandler::LoadResult VkService::GetGroupNextSongUrl(const QUrl& url) {
|
||||
QStringList tokens = url.path().split('/');
|
||||
if (tokens.count() < 3) {
|
||||
qLog(Error) << "Wrong url" << url;
|
||||
return UrlHandler::LoadResult();
|
||||
return UrlHandler::LoadResult(url);
|
||||
}
|
||||
|
||||
int gid = tokens[1].toInt();
|
||||
|
@ -1232,7 +1232,7 @@ UrlHandler::LoadResult VkService::GetGroupNextSongUrl(const QUrl& url) {
|
|||
}
|
||||
|
||||
qLog(Info) << "Unresolved group url" << url;
|
||||
return UrlHandler::LoadResult();
|
||||
return UrlHandler::LoadResult(url);
|
||||
}
|
||||
|
||||
/***
|
||||
|
|
|
@ -30,7 +30,7 @@ VkUrlHandler::VkUrlHandler(VkService* service, QObject* parent)
|
|||
|
||||
UrlHandler::LoadResult VkUrlHandler::StartLoading(const QUrl& url) {
|
||||
QStringList args = url.path().split("/");
|
||||
LoadResult result;
|
||||
LoadResult result(url);
|
||||
|
||||
if (args.size() < 2) {
|
||||
qLog(Error)
|
||||
|
@ -58,6 +58,6 @@ UrlHandler::LoadResult VkUrlHandler::LoadNext(const QUrl& url) {
|
|||
if (url.host() == "group") {
|
||||
return StartLoading(url);
|
||||
} else {
|
||||
return LoadResult();
|
||||
return LoadResult(url);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue