Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-18 12:28:31 +01:00
Code Issues Releases Wiki Activity

Use libspotify 12.1.45.

Browse Source 
Fixes issue #2972
This commit is contained in:
John Maguire 2012-06-07 11:21:02 +02:00
parent 6ada003b08
commit 9dd4f31795
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -68,7 +68,7 @@ pkg_check_modules(PLIST libplist)
pkg_check_modules(USBMUXD libusbmuxd) pkg_check_modules(USBMUXD libusbmuxd)
pkg_check_modules(LIBMTP libmtp>=1.0) pkg_check_modules(LIBMTP libmtp>=1.0)
pkg_check_modules(INDICATEQT indicate-qt) 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(CDIO libcdio)
pkg_check_modules(QCA qca2) pkg_check_modules(QCA qca2)
pkg_check_modules(CHROMAPRINT libchromaprint) pkg_check_modules(CHROMAPRINT libchromaprint)

2
cmake/SpotifyVersion.cmake
View File

@ -1,3 +1,3 @@
# Increment this whenever the user needs to download a new blob # Increment this whenever the user needs to download a new blob
# Remember to upload and sign the new version of the blob. # Remember to upload and sign the new version of the blob.
set(SPOTIFY_BLOB_VERSION 12) set(SPOTIFY_BLOB_VERSION 13)

5
ext/clementine-spotifyblob/spotifyclient.cpp
View File

@ -575,7 +575,8 @@ void SpotifyClient::ConvertTrack(sp_track* track, pb::spotify::Track* pb) {
// Album art // Album art
const QByteArray art_id( const QByteArray art_id(
reinterpret_cast<const char*>(sp_album_cover(sp_track_album(track))), reinterpret_cast<const char*>(
sp_album_cover(sp_track_album(track), SP_IMAGE_SIZE_LARGE)),
kSpotifyImageIDSize); kSpotifyImageIDSize);
const QString art_id_b64 = QString::fromAscii(art_id.toBase64()); const QString art_id_b64 = QString::fromAscii(art_id.toBase64());
pb->set_album_art_id(DataCommaSizeFromQString(art_id_b64)); 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 // Album art
const QByteArray art_id( const QByteArray art_id(
reinterpret_cast<const char*>(sp_album_cover(album)), reinterpret_cast<const char*>(sp_album_cover(album, SP_IMAGE_SIZE_LARGE)),
kSpotifyImageIDSize); kSpotifyImageIDSize);
const QString art_id_b64 = QString::fromAscii(art_id.toBase64()); const QString art_id_b64 = QString::fromAscii(art_id.toBase64());
pb->set_album_art_id(DataCommaSizeFromQString(art_id_b64)); pb->set_album_art_id(DataCommaSizeFromQString(art_id_b64));

4
src/internet/spotifyblobdownloader.cpp
View File

@ -69,8 +69,8 @@ void SpotifyBlobDownloader::Start() {
const QStringList filenames = QStringList() const QStringList filenames = QStringList()
<< "blob" << "blob"
<< "blob" + QString(kSignatureSuffix) << "blob" + QString(kSignatureSuffix)
<< "libspotify.so.11.1.56" << "libspotify.so.12.1.45"
<< "libspotify.so.11.1.56" + QString(kSignatureSuffix); << "libspotify.so.12.1.45" + QString(kSignatureSuffix);
foreach (const QString& filename, filenames) { foreach (const QString& filename, filenames) {
const QUrl url(SpotifyService::kBlobDownloadUrl + version_ + "/" + filename); const QUrl url(SpotifyService::kBlobDownloadUrl + version_ + "/" + filename);