From 1c80cfbadbc422f2889d63482502e0c2c7285004 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Tue, 27 Mar 2012 22:01:37 +0100 Subject: [PATCH] Use libspotify 11.1.56 --- CMakeLists.txt | 2 +- ext/clementine-spotifyblob/spotifyclient.cpp | 6 +++++- src/internet/spotifyblobdownloader.cpp | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eff30d131..34a2db4b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,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>=10.1.16) +pkg_check_modules(SPOTIFY libspotify>=11.1.56) pkg_check_modules(CDIO libcdio) pkg_check_modules(QCA qca2) pkg_check_modules(CHROMAPRINT libchromaprint) diff --git a/ext/clementine-spotifyblob/spotifyclient.cpp b/ext/clementine-spotifyblob/spotifyclient.cpp index 2af08a28d..7d5b6a92d 100644 --- a/ext/clementine-spotifyblob/spotifyclient.cpp +++ b/ext/clementine-spotifyblob/spotifyclient.cpp @@ -140,6 +140,7 @@ void SpotifyClient::LoggedInCallback(sp_session* session, sp_error error) { sp_playlistcontainer_add_callbacks( sp_session_playlistcontainer(session), &me->playlistcontainer_callbacks_, me); + sp_session_flush_caches(me->session_); } } @@ -164,6 +165,8 @@ void SpotifyClient::Search(const pb::spotify::SearchRequest& req) { 0, req.limit(), 0, req.limit_album(), 0, 0, // artists + 0, 0, // playlists + SP_SEARCH_STANDARD, &SearchCompleteCallback, this); pending_searches_[search] = req; @@ -322,7 +325,8 @@ void SpotifyClient::Login(const pb::spotify::LoginRequest& req) { sp_session_login(session_, req.username().c_str(), req.password().c_str(), - true); // Remember the password. + true, // Remember the password. + NULL); } } diff --git a/src/internet/spotifyblobdownloader.cpp b/src/internet/spotifyblobdownloader.cpp index 16cbcdb75..7645ce259 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.10.1.16" - << "libspotify.so.10.1.16" + QString(kSignatureSuffix); + << "libspotify.so.11.1.56" + << "libspotify.so.11.1.56" + QString(kSignatureSuffix); foreach (const QString& filename, filenames) { const QUrl url(SpotifyService::kBlobDownloadUrl + version_ + "/" + filename);