Revision 877693

Go back to digest for 2nd November 2008

Other in Multimedia

Leo Franchi committed changes in /trunk/extragear/multimedia/amarok:

new last.fm code for the last.fm service.
basically, this replaces our old last.fm code drop from the 1.4 client with the new modular liblastfm from max at last.fm. currently the library is included here in-source, and we are compiling it as a lib and linking to it internally.

as soon as they can, last.fm will release it as liblastfm, and amarok will depend on it. for now, and 2.0, this will stay in-source.
note that i include a FindLibLastFm.cmake that is not being used, as soon as we switch to the external lib we can just switch to searching for the external lib w/ no hassle.

NOTE: *please* test.
i've tried to stress it as much as i can, but i can't think of all the edge cases. break it!

this should fix a number of bugs with the old client.

there is 1 bug that i know of with this code, and i have email max.

Bug 154904: Amarok keeps playing current lastfm song when requested to skip (if next track is also las...

306 days

Bug 155197: amarok not updating the name of author and song that it is playing from last fm

300 days

Bug 157296: After playing last fm stream, I can't play last fm again (just with Xine >=1 1 9)

269 days

Bug 164156: Amarok does not submit tracks to Last fm when listening to Last fm radio

139 days

Bug 170816: amarok sometimes submits last fm tracks too soon

52 days

File Changes

Added 199 files

/trunk/extragear/multimedia/amarok
/cmake/modules/FindLibLastFm.cmake
/src/services/lastfm/lastfm
/src/services/lastfm/lastfm/CMakeLists.txt
/src/services/lastfm/lastfm/common
/src/services/lastfm/lastfm/core
/src/services/lastfm/lastfm/DllExportMacro.h
/src/services/lastfm/lastfm/fingerprint
/src/services/lastfm/lastfm/radio
/src/services/lastfm/lastfm/scrobble
/src/services/lastfm/lastfm/Scrobbler.h
/src/services/lastfm/lastfm/types
/src/services/lastfm/lastfm/ws
/src/services/lastfm/lastfm/common/bash
/src/services/lastfm/lastfm/common/c++
/src/services/lastfm/lastfm/common/dist
/src/services/lastfm/lastfm/common/FileLocations.h
/src/services/lastfm/lastfm/common/HideStupidWarnings.h
/src/services/lastfm/lastfm/common/precompiled.h
/src/services/lastfm/lastfm/common/qmake
/src/services/lastfm/lastfm/common/qrc
/src/services/lastfm/lastfm/common/qt
/src/services/lastfm/lastfm/core/_build
/src/services/lastfm/lastfm/core/CoreDir.cpp
/src/services/lastfm/lastfm/core/CoreDir.h
/src/services/lastfm/lastfm/core/CoreDomElement.cpp
/src/services/lastfm/lastfm/core/CoreDomElement.h
/src/services/lastfm/lastfm/core/CoreException.h
/src/services/lastfm/lastfm/core/CoreLocale.cpp
/src/services/lastfm/lastfm/core/CoreLocale.h
/src/services/lastfm/lastfm/core/CoreProcess.cpp
/src/services/lastfm/lastfm/core/CoreProcess.h
/src/services/lastfm/lastfm/core/CoreSettings.h
/src/services/lastfm/lastfm/core/CoreSysInfo.cpp
/src/services/lastfm/lastfm/core/CoreSysInfo.h
/src/services/lastfm/lastfm/core/CoreUrl.cpp
/src/services/lastfm/lastfm/core/CoreUrl.h
/src/services/lastfm/lastfm/core/libcore.pro
/src/services/lastfm/lastfm/core/mac
/src/services/lastfm/lastfm/core/Makefile.libcore
/src/services/lastfm/lastfm/core/QMessageBoxBuilder.cpp
/src/services/lastfm/lastfm/core/QMessageBoxBuilder.h
/src/services/lastfm/lastfm/core/README
/src/services/lastfm/lastfm/core/UniqueApplication.cpp
/src/services/lastfm/lastfm/core/UniqueApplication.h
/src/services/lastfm/lastfm/core/WeightedString.h
/src/services/lastfm/lastfm/core/WeightedStringList.h
/src/services/lastfm/lastfm/core/win
/src/services/lastfm/lastfm/fingerprint/Collection.cpp
/src/services/lastfm/lastfm/fingerprint/Collection.h
/src/services/lastfm/lastfm/fingerprint/FingerprintDllExportMacro.h
/src/services/lastfm/lastfm/fingerprint/FingerprintGenerator.cpp
/src/services/lastfm/lastfm/fingerprint/FingerprintGenerator.h
/src/services/lastfm/lastfm/fingerprint/FingerprintIdRequest.cpp
/src/services/lastfm/lastfm/fingerprint/FingerprintIdRequest.h
/src/services/lastfm/lastfm/fingerprint/fplib
/src/services/lastfm/lastfm/fingerprint/libfingerprint.pro
/src/services/lastfm/lastfm/fingerprint/MP3_Source_Qt.cpp
/src/services/lastfm/lastfm/fingerprint/MP3_Source_Qt.h
/src/services/lastfm/lastfm/fingerprint/README
/src/services/lastfm/lastfm/fingerprint/Sha256.cpp
/src/services/lastfm/lastfm/fingerprint/Sha256.h
/src/services/lastfm/lastfm/fingerprint/Sha256File.cpp
/src/services/lastfm/lastfm/fingerprint/Sha256File.h
/src/services/lastfm/lastfm/fingerprint/tests
/src/services/lastfm/lastfm/fingerprint/TranscodeInterface.h
/src/services/lastfm/lastfm/radio/_build
/src/services/lastfm/lastfm/radio/libradio.pro
/src/services/lastfm/lastfm/radio/Makefile.libradio
/src/services/lastfm/lastfm/radio/Playlist.cpp
/src/services/lastfm/lastfm/radio/Playlist.h
/src/services/lastfm/lastfm/radio/Radio.cpp
/src/services/lastfm/lastfm/radio/Radio.h
/src/services/lastfm/lastfm/radio/RadioStation.h
/src/services/lastfm/lastfm/radio/README
/src/services/lastfm/lastfm/radio/Tuner.cpp
/src/services/lastfm/lastfm/radio/Tuner.h
/src/services/lastfm/lastfm/scrobble/_build
/src/services/lastfm/lastfm/scrobble/libscrobble.pro
/src/services/lastfm/lastfm/scrobble/NowPlaying.cpp
/src/services/lastfm/lastfm/scrobble/NowPlaying.h
/src/services/lastfm/lastfm/scrobble/Scrobble.cpp
/src/services/lastfm/lastfm/scrobble/Scrobble.h
/src/services/lastfm/lastfm/scrobble/ScrobbleCache.cpp
/src/services/lastfm/lastfm/scrobble/ScrobbleCache.h
/src/services/lastfm/lastfm/scrobble/ScrobblePoint.h
/src/services/lastfm/lastfm/scrobble/Scrobbler.cpp
/src/services/lastfm/lastfm/scrobble/Scrobbler.h
/src/services/lastfm/lastfm/scrobble/ScrobblerHandshake.cpp
/src/services/lastfm/lastfm/scrobble/ScrobblerHandshake.h
/src/services/lastfm/lastfm/scrobble/ScrobblerHttp.cpp
/src/services/lastfm/lastfm/scrobble/ScrobblerHttp.h
/src/services/lastfm/lastfm/scrobble/ScrobblerSubmission.cpp
/src/services/lastfm/lastfm/scrobble/ScrobblerSubmission.h
/src/services/lastfm/lastfm/types/_build
/src/services/lastfm/lastfm/types/Album.cpp
/src/services/lastfm/lastfm/types/Album.h
/src/services/lastfm/lastfm/types/Artist.cpp
/src/services/lastfm/lastfm/types/Artist.h
/src/services/lastfm/lastfm/types/libtypes.pro
/src/services/lastfm/lastfm/types/Makefile.libtypes
/src/services/lastfm/lastfm/types/Mbid.cpp
/src/services/lastfm/lastfm/types/Mbid.h
/src/services/lastfm/lastfm/types/mbid_mp3.c
/src/services/lastfm/lastfm/types/qrc
/src/services/lastfm/lastfm/types/Tag.cpp
/src/services/lastfm/lastfm/types/Tag.h
/src/services/lastfm/lastfm/types/Track.cpp
/src/services/lastfm/lastfm/types/Track.h
/src/services/lastfm/lastfm/types/User.cpp
/src/services/lastfm/lastfm/types/User.h
/src/services/lastfm/lastfm/ws/_build
/src/services/lastfm/lastfm/ws/libws.pro
/src/services/lastfm/lastfm/ws/Makefile.libws
/src/services/lastfm/lastfm/ws/NdisEvents_win.cpp
/src/services/lastfm/lastfm/ws/NdisEvents_win.h
/src/services/lastfm/lastfm/ws/WmiSink_win.cpp
/src/services/lastfm/lastfm/ws/WmiSink_win.h
/src/services/lastfm/lastfm/ws/WsAccessManager.cpp
/src/services/lastfm/lastfm/ws/WsAccessManager.h
/src/services/lastfm/lastfm/ws/WsAutoProxy.cpp
/src/services/lastfm/lastfm/ws/WsAutoProxy.h
/src/services/lastfm/lastfm/ws/WsError.h
/src/services/lastfm/lastfm/ws/WsKeys.h
/src/services/lastfm/lastfm/ws/WsNetEvent.cpp
/src/services/lastfm/lastfm/ws/WsNetEvent.h
/src/services/lastfm/lastfm/ws/WsProxy.cpp
/src/services/lastfm/lastfm/ws/WsProxy.h
/src/services/lastfm/lastfm/ws/WsReply.cpp
/src/services/lastfm/lastfm/ws/WsReply.h
/src/services/lastfm/lastfm/ws/WsRequestBuilder.cpp
/src/services/lastfm/lastfm/ws/WsRequestBuilder.h
/src/services/lastfm/lastfm/ws/WsRequestParameters.cpp
/src/services/lastfm/lastfm/ws/WsRequestParameters.h
/src/services/lastfm/lastfm/common/bash/generate_ide_projects.sh.inc
/src/services/lastfm/lastfm/common/bash/svn_revision.sh
/src/services/lastfm/lastfm/common/bash/utils.sh.inc
/src/services/lastfm/lastfm/common/c++/Logger.cpp
/src/services/lastfm/lastfm/common/c++/Logger.h
/src/services/lastfm/lastfm/common/c++/mac
/src/services/lastfm/lastfm/common/dist/i18n.pl
/src/services/lastfm/lastfm/common/dist/mac
/src/services/lastfm/lastfm/common/qmake/breakpad.pro.inc
/src/services/lastfm/lastfm/common/qmake/debug.pro.inc
/src/services/lastfm/lastfm/common/qmake/findSources.pl
/src/services/lastfm/lastfm/common/qmake/findsources.pro.inc
/src/services/lastfm/lastfm/common/qmake/include.pro
/src/services/lastfm/lastfm/common/qmake/manifest.pro.inc
/src/services/lastfm/lastfm/common/qmake/QtOverride.pro.inc
/src/services/lastfm/lastfm/common/qrc/common.qrc
/src/services/lastfm/lastfm/common/qt/md5.cpp
/src/services/lastfm/lastfm/common/qt/override
/src/services/lastfm/lastfm/common/qt/README
/src/services/lastfm/lastfm/common/qt/sort.cpp
/src/services/lastfm/lastfm/core/_build/moc_UniqueApplication.cpp
/src/services/lastfm/lastfm/core/mac/AppleScript.cpp
/src/services/lastfm/lastfm/core/mac/AppleScript.h
/src/services/lastfm/lastfm/core/mac/CFStringToQString.cpp
/src/services/lastfm/lastfm/core/mac/CFStringToQString.h
/src/services/lastfm/lastfm/core/mac/Growl.cpp
/src/services/lastfm/lastfm/core/mac/Growl.h
/src/services/lastfm/lastfm/core/win/Utils.cpp
/src/services/lastfm/lastfm/core/win/Utils.h
/src/services/lastfm/lastfm/fingerprint/fplib/include
/src/services/lastfm/lastfm/fingerprint/fplib/pro_qmake
/src/services/lastfm/lastfm/fingerprint/fplib/src
/src/services/lastfm/lastfm/fingerprint/fplib/win32
/src/services/lastfm/lastfm/fingerprint/tests/mocks
/src/services/lastfm/lastfm/fingerprint/tests/TestFingerprintGenerator.cpp
/src/services/lastfm/lastfm/fingerprint/tests/TestFingerprintIdRequest.cpp
/src/services/lastfm/lastfm/radio/_build/moc_Radio.cpp
/src/services/lastfm/lastfm/radio/_build/moc_Tuner.cpp
/src/services/lastfm/lastfm/scrobble/_build/moc_Scrobbler.cpp
/src/services/lastfm/lastfm/scrobble/_build/moc_ScrobblerHttp.cpp
/src/services/lastfm/lastfm/types/_build/moc_Album.cpp
/src/services/lastfm/lastfm/types/_build/qrc_types.cpp
/src/services/lastfm/lastfm/types/qrc/types.qrc
/src/services/lastfm/lastfm/ws/_build/moc_WsAccessManager.cpp
/src/services/lastfm/lastfm/ws/_build/moc_WsNetEvent.cpp
/src/services/lastfm/lastfm/ws/_build/moc_WsProxy.cpp
/src/services/lastfm/lastfm/ws/_build/moc_WsReply.cpp
/src/services/lastfm/lastfm/common/c++/mac/getBsdProcessList.c
/src/services/lastfm/lastfm/common/dist/mac/deposx.sh
/src/services/lastfm/lastfm/common/dist/mac/Makefile.dmg.pl
/src/services/lastfm/lastfm/common/qt/override/QDebug
/src/services/lastfm/lastfm/common/qt/override/QHttp
/src/services/lastfm/lastfm/common/qt/override/QMessageBox
/src/services/lastfm/lastfm/common/qt/override/QNetworkAccessManager
/src/services/lastfm/lastfm/common/qt/override/README
/src/services/lastfm/lastfm/fingerprint/fplib/include/FingerprintExtractor.h
/src/services/lastfm/lastfm/fingerprint/fplib/pro_qmake/fplib.pro
/src/services/lastfm/lastfm/fingerprint/fplib/src/CircularArray.h
/src/services/lastfm/lastfm/fingerprint/fplib/src/Filter.cpp
/src/services/lastfm/lastfm/fingerprint/fplib/src/Filter.h
/src/services/lastfm/lastfm/fingerprint/fplib/src/FingerprintExtractor.cpp
/src/services/lastfm/lastfm/fingerprint/fplib/src/FloatingAverage.h
/src/services/lastfm/lastfm/fingerprint/fplib/src/fp_helper_fun.h
/src/services/lastfm/lastfm/fingerprint/fplib/src/OptFFT.cpp
/src/services/lastfm/lastfm/fingerprint/fplib/src/OptFFT.h
/src/services/lastfm/lastfm/fingerprint/tests/mocks/Collection.h

Deleted 3 files

/trunk/extragear/multimedia/amarok/src/services/lastfm
/core
/libUnicorn
/README

Modified 19 files

/trunk/extragear/multimedia/amarok
/CMakeLists.txt
/src/App.cpp
/cmake/modules/FindMySQLAmarok.cmake
/src/services/lastfm/AudioController.h
/src/services/lastfm/CMakeLists.txt
/src/services/lastfm/LastFmService.cpp
/src/services/lastfm/LastFmService.h
/src/services/lastfm/LastFmServiceCollection.cpp
/src/services/lastfm/LastFmServiceCollection.h
/src/services/lastfm/LastFmSettings.cpp
/src/services/lastfm/LastFmSettings.h
/src/services/lastfm/RadioAdapter.cpp
/src/services/lastfm/RadioAdapter.h
/src/services/lastfm/ScrobblerAdapter.cpp
/src/services/lastfm/ScrobblerAdapter.h
/src/services/lastfm/meta/LastFmMeta.cpp
/src/services/lastfm/meta/LastFmMeta.h
/src/services/lastfm/meta/LastFmMeta_p.h
/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h

221 files changed in total