From 9dd4f3179576c1175e24261cbe40db5e7b929bcf Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 7 Jun 2012 11:21:02 +0200 Subject: [PATCH] Use libspotify 12.1.45. Fixes issue #2972 --- CMakeLists.txt | 2 +- cmake/SpotifyVersion.cmake | 2 +- ext/clementine-spotifyblob/spotifyclient.cpp | 5 +++-- src/internet/spotifyblobdownloader.cpp | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca139c2cb..56e99363f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ pkg_check_modules(PLIST libplist) pkg_check_modules(USBMUXD libusbmuxd) pkg_check_modules(LIBMTP libmtp>=1.0) pkg_check_modules(INDICATEQT indicate-qt) -pkg_check_modules(SPOTIFY libspotify>=11.1.56) +pkg_check_modules(SPOTIFY libspotify>=12.1.45) pkg_check_modules(CDIO libcdio) pkg_check_modules(QCA qca2) pkg_check_modules(CHROMAPRINT libchromaprint) diff --git a/cmake/SpotifyVersion.cmake b/cmake/SpotifyVersion.cmake index 077f2ecbf..e28462351 100644 --- a/cmake/SpotifyVersion.cmake +++ b/cmake/SpotifyVersion.cmake @@ -1,3 +1,3 @@ # Increment this whenever the user needs to download a new blob # Remember to upload and sign the new version of the blob. -set(SPOTIFY_BLOB_VERSION 12) +set(SPOTIFY_BLOB_VERSION 13) diff --git a/ext/clementine-spotifyblob/spotifyclient.cpp b/ext/clementine-spotifyblob/spotifyclient.cpp index 7d5b6a92d..ef2fa4c8c 100644 --- a/ext/clementine-spotifyblob/spotifyclient.cpp +++ b/ext/clementine-spotifyblob/spotifyclient.cpp @@ -575,7 +575,8 @@ void SpotifyClient::ConvertTrack(sp_track* track, pb::spotify::Track* pb) { // Album art const QByteArray art_id( - reinterpret_cast(sp_album_cover(sp_track_album(track))), + reinterpret_cast( + sp_album_cover(sp_track_album(track), SP_IMAGE_SIZE_LARGE)), kSpotifyImageIDSize); const QString art_id_b64 = QString::fromAscii(art_id.toBase64()); pb->set_album_art_id(DataCommaSizeFromQString(art_id_b64)); @@ -610,7 +611,7 @@ void SpotifyClient::ConvertAlbum(sp_album* album, pb::spotify::Track* pb) { // Album art const QByteArray art_id( - reinterpret_cast(sp_album_cover(album)), + reinterpret_cast(sp_album_cover(album, SP_IMAGE_SIZE_LARGE)), kSpotifyImageIDSize); const QString art_id_b64 = QString::fromAscii(art_id.toBase64()); pb->set_album_art_id(DataCommaSizeFromQString(art_id_b64)); diff --git a/src/internet/spotifyblobdownloader.cpp b/src/internet/spotifyblobdownloader.cpp index 7645ce259..2dbe7d70a 100644 --- a/src/internet/spotifyblobdownloader.cpp +++ b/src/internet/spotifyblobdownloader.cpp @@ -69,8 +69,8 @@ void SpotifyBlobDownloader::Start() { const QStringList filenames = QStringList() << "blob" << "blob" + QString(kSignatureSuffix) - << "libspotify.so.11.1.56" - << "libspotify.so.11.1.56" + QString(kSignatureSuffix); + << "libspotify.so.12.1.45" + << "libspotify.so.12.1.45" + QString(kSignatureSuffix); foreach (const QString& filename, filenames) { const QUrl url(SpotifyService::kBlobDownloadUrl + version_ + "/" + filename);