dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename original_url to media_url

Browse Source
This commit is contained in:
Jonas Kvinge
2023-04-21 16:20:00 +02:00
parent 3bedfb6ac8
commit bee6b7f946
26 changed files with 160 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/qobuz/qobuzstreamurlrequest.cpp
View File

@@ -41,13 +41,13 @@
#include "qobuzbaserequest.h"
#include "qobuzstreamurlrequest.h"
QobuzStreamURLRequest::QobuzStreamURLRequest(QobuzService *service, NetworkAccessManager *network, const QUrl &original_url, const uint id, QObject *parent)
QobuzStreamURLRequest::QobuzStreamURLRequest(QobuzService *service, NetworkAccessManager *network, const QUrl &media_url, const uint id, QObject *parent)
: QobuzBaseRequest(service, network, parent),
service_(service),
reply_(nullptr),
original_url_(original_url),
media_url_(media_url),
id_(id),
song_id_(original_url.path().toInt()),
song_id_(media_url.path().toInt()),
tries_(0),
need_login_(false) {}
@@ -67,7 +67,7 @@ void QobuzStreamURLRequest::LoginComplete(const bool success, const QString &err
need_login_ = false;
if (!success) {
emit StreamURLFailure(id_, original_url_, error);
emit StreamURLFailure(id_, media_url_, error);
return;
}
@@ -78,7 +78,7 @@ void QobuzStreamURLRequest::LoginComplete(const bool success, const QString &err
void QobuzStreamURLRequest::Process() {
if (app_id().isEmpty() || app_secret().isEmpty()) {
emit StreamURLFailure(id_, original_url_, tr("Missing Qobuz app ID or secret."));
emit StreamURLFailure(id_, media_url_, tr("Missing Qobuz app ID or secret."));
return;
}
@@ -97,7 +97,7 @@ void QobuzStreamURLRequest::Cancel() {
reply_->abort();
}
else {
emit StreamURLFailure(id_, original_url_, tr("Cancelled."));
emit StreamURLFailure(id_, media_url_, tr("Cancelled."));
}
}
@@ -157,32 +157,32 @@ void QobuzStreamURLRequest::StreamURLReceived() {
need_login_ = true;
return;
}
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
QJsonObject json_obj = ExtractJsonObj(data);
if (json_obj.isEmpty()) {
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
if (!json_obj.contains("track_id")) {
Error("Invalid Json reply, stream url is missing track_id.", json_obj);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
int track_id = json_obj["track_id"].toInt();
if (track_id != song_id_) {
Error("Incorrect track ID returned.", json_obj);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
if (!json_obj.contains("mime_type") || !json_obj.contains("url")) {
Error("Invalid Json reply, stream url is missing url or mime_type.", json_obj);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
@@ -203,7 +203,7 @@ void QobuzStreamURLRequest::StreamURLReceived() {
if (!url.isValid()) {
Error("Returned stream url is invalid.", json_obj);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
@@ -220,7 +220,7 @@ void QobuzStreamURLRequest::StreamURLReceived() {
bit_depth = static_cast<int>(json_obj["bit_depth"].toDouble());
}
emit StreamURLSuccess(id_, original_url_, url, filetype, samplerate, bit_depth, duration);
emit StreamURLSuccess(id_, media_url_, url, filetype, samplerate, bit_depth, duration);
}