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

Fixing issues in the pull request.

Browse Source
This commit is contained in:
David Guillen Fandos 2016-03-12 19:44:32 +00:00
parent e4efde900a
commit 10bac1cd2d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/covers/albumcoverloader.h
View File

@ -110,7 +110,8 @@ class AlbumCoverLoader : public QObject {
NetworkAccessManager* network_;
bool connected_spotify_, connected_subsonic_;
bool connected_spotify_;
bool connected_subsonic_;
static const int kMaxRedirects = 3;
};

7
src/internet/subsonic/subsonicservice.cpp
View File

@ -59,6 +59,7 @@ const char* SubsonicService::kSongsTable = "subsonic_songs";
const char* SubsonicService::kFtsTable = "subsonic_songs_fts";
const int SubsonicService::kMaxRedirects = 10;
const int SubsonicService::kCoverArtSize = 1024;
SubsonicService::SubsonicService(Application* app, InternetModel* parent)
: InternetService(kServiceName, app, parent, parent),
@ -573,7 +574,7 @@ void SubsonicLibraryScanner::OnGetAlbumCoverFinished(QNetworkReply* reply, QStri
QByteArray image = reply->readAll();
service_->emitImageLoaded(albumid, QImage::fromData(image));
service_->EmitImageLoaded(albumid, QImage::fromData(image));
}
void SubsonicLibraryScanner::GetAlbumList(int offset) {
@ -589,7 +590,7 @@ void SubsonicLibraryScanner::GetAlbumList(int offset) {
void SubsonicLibraryScanner::GetAlbumCover(const QString& id) {
QUrl url = service_->BuildRequestUrl("getCoverArt");
url.addQueryItem("id", id);
url.addQueryItem("size", "1024");
url.addQueryItem("size", QString::number(kCoverArtSize));
QNetworkReply* reply = service_->Send(url);
NewClosure(reply, SIGNAL(finished()), this,
SLOT(OnGetAlbumCoverFinished(QNetworkReply*,QString)), reply, id);
@ -600,7 +601,7 @@ void SubsonicService::LoadImage(const QString& id) {
scanner_->GetAlbumCover(id);
}
void SubsonicService::emitImageLoaded(const QString& id, const QImage& image) {
void SubsonicService::EmitImageLoaded(const QString& id, const QImage& image) {
emit ImageLoaded(id, image);
}

2
src/internet/subsonic/subsonicservice.h
View File

@ -102,7 +102,7 @@ class SubsonicService : public InternetService {
LoginState login_state() const { return login_state_; }
Q_INVOKABLE void LoadImage(const QString& id);
void emitImageLoaded(const QString& id, const QImage& image);
void EmitImageLoaded(const QString& id, const QImage& image);
// Subsonic API methods
void Ping();