Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix minor code issues with Qobuz

Browse Source
This commit is contained in:
Jonas Kvinge 2019-06-19 12:57:12 +02:00
parent 26633e0982
commit 7c0ab4212b
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qobuz/qobuzrequest.cpp
View File

@ -996,7 +996,7 @@ int QobuzRequest::ParseSong(Song &song, const QJsonObject &json_obj, int artist_
Error("Invalid Json reply, track composer is missing id or name.", json_obj_composer); Error("Invalid Json reply, track composer is missing id or name.", json_obj_composer);
return -1; return -1;
} }
QString composer = json_obj_composer["name"].toString(); composer = json_obj_composer["name"].toString();
} }
if (json_obj.contains("performer")) { if (json_obj.contains("performer")) {

1
src/qobuz/qobuzrequest.h
View File

@ -72,7 +72,6 @@ class QobuzRequest : public QobuzBaseRequest {
void StreamURLFinished(const QUrl original_url, const QUrl url, const Song::FileType, QString error = QString()); void StreamURLFinished(const QUrl original_url, const QUrl url, const Song::FileType, QString error = QString());
private slots: private slots:
//void LoginComplete(bool success, QString error = QString());
void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested); void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);

3
src/qobuz/qobuzservice.cpp
View File

@ -403,7 +403,6 @@ void QobuzService::GetArtists() {
connect(artists_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(ArtistsUpdateStatus(QString))); connect(artists_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(ArtistsUpdateStatus(QString)));
connect(artists_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(ArtistsProgressSetMaximum(int))); connect(artists_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(ArtistsProgressSetMaximum(int)));
connect(artists_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(ArtistsUpdateProgress(int))); connect(artists_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(ArtistsUpdateProgress(int)));
connect(this, SIGNAL(LoginComplete(bool, QString)), artists_request_.get(), SLOT(LoginComplete(bool, QString)));
artists_request_->Process(); artists_request_->Process();
@ -440,7 +439,6 @@ void QobuzService::GetAlbums() {
connect(albums_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(AlbumsUpdateStatus(QString))); connect(albums_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(AlbumsUpdateStatus(QString)));
connect(albums_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(AlbumsProgressSetMaximum(int))); connect(albums_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(AlbumsProgressSetMaximum(int)));
connect(albums_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(AlbumsUpdateProgress(int))); connect(albums_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(AlbumsUpdateProgress(int)));
connect(this, SIGNAL(LoginComplete(bool, QString)), albums_request_.get(), SLOT(LoginComplete(bool, QString)));
albums_request_->Process(); albums_request_->Process();
@ -477,7 +475,6 @@ void QobuzService::GetSongs() {
connect(songs_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(SongsUpdateStatus(QString))); connect(songs_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(SongsUpdateStatus(QString)));
connect(songs_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(SongsProgressSetMaximum(int))); connect(songs_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(SongsProgressSetMaximum(int)));
connect(songs_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(SongsUpdateProgress(int))); connect(songs_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(SongsUpdateProgress(int)));
connect(this, SIGNAL(LoginComplete(bool, QString)), songs_request_.get(), SLOT(LoginComplete(bool, QString)));
songs_request_->Process(); songs_request_->Process();