Revision 868137

Go back to digest for 12th October 2008

Other in Multimedia

Nikolaj Hald Nielsen committed changes in /trunk/extragear/multimedia/amarok/src:

This is going to sting a bit....
Major restructuring. Move the service framework as well as the individual services to the new src/services directory but leave the servicebrowser specific stuff in /src/browsers/servicebrowser.

Also use to opportunity to clean up some directory names.

File Changes

Added 329 files

/trunk/extragear/multimedia/amarok/src/services
/ampache
/CMakeLists.txt
/DynamicServiceQueryMaker.cpp
/DynamicServiceQueryMaker.h
/InfoParserBase.cpp
/InfoParserBase.h
/jamendo
/lastfm
/magnatune
/mp3tunes
/opmldirectory
/scriptable
/ServiceAlbumCoverDownloader.cpp
/ServiceAlbumCoverDownloader.h
/ServiceBase.cpp
/ServiceBase.h
/ServiceCollection.cpp
/ServiceCollection.h
/ServiceCollectionLocation.cpp
/ServiceCollectionLocation.h
/ServiceCollectionTreeView.cpp
/ServiceCollectionTreeView.h
/ServiceCurrentTrackActionsCapability.cpp
/ServiceCurrentTrackActionsCapability.h
/ServiceCustomActionsCapability.cpp
/ServiceCustomActionsCapability.h
/ServiceInfoObserver.h
/ServiceInfoProxy.cpp
/ServiceInfoProxy.h
/ServiceMetaBase.cpp
/ServiceMetaBase.h
/ServicePluginManager.cpp
/ServicePluginManager.h
/ServiceSourceInfoCapability.cpp
/ServiceSourceInfoCapability.h
/ServiceSqlCollection.cpp
/ServiceSqlCollection.h
/ServiceSqlQueryMaker.cpp
/ServiceSqlQueryMaker.h
/ServiceSqlRegistry.cpp
/ServiceSqlRegistry.h
/shoutcast
/ShowInServiceAction.cpp
/ShowInServiceAction.h
/ampache/amarok_service_ampache.desktop
/ampache/amarok_service_ampache_config.desktop
/ampache/AmpacheConfig.cpp
/ampache/AmpacheConfig.h
/ampache/AmpacheConfigWidget.ui
/ampache/AmpacheMeta.cpp
/ampache/AmpacheMeta.h
/ampache/AmpacheService.cpp
/ampache/AmpacheService.h
/ampache/AmpacheServiceCollection.cpp
/ampache/AmpacheServiceCollection.h
/ampache/AmpacheServiceQueryMaker.cpp
/ampache/AmpacheServiceQueryMaker.h
/ampache/AmpacheSettings.cpp
/ampache/AmpacheSettings.h
/ampache/CMakeLists.txt
/jamendo/amarok_service_jamendo.desktop
/jamendo/CMakeLists.txt
/jamendo/JamendoDatabaseHandler.cpp
/jamendo/JamendoDatabaseHandler.h
/jamendo/JamendoInfoParser.cpp
/jamendo/JamendoInfoParser.h
/jamendo/JamendoMeta.cpp
/jamendo/JamendoMeta.h
/jamendo/JamendoService.cpp
/jamendo/JamendoService.h
/jamendo/JamendoXmlParser.cpp
/jamendo/JamendoXmlParser.h
/lastfm/amarok_service_lastfm.desktop
/lastfm/amarok_service_lastfm_config.desktop
/lastfm/AudioController.cpp
/lastfm/AudioController.h
/lastfm/CMakeLists.txt
/lastfm/core
/lastfm/LastFmConfigWidget.ui
/lastfm/LastFmService.cpp
/lastfm/LastFmService.h
/lastfm/LastFmServiceCollection.cpp
/lastfm/LastFmServiceCollection.h
/lastfm/LastFmServiceConfig.cpp
/lastfm/LastFmServiceConfig.h
/lastfm/LastFmServiceQueryMaker.cpp
/lastfm/LastFmServiceQueryMaker.h
/lastfm/LastFmServiceSettings.cpp
/lastfm/LastFmServiceSettings.h
/lastfm/LastFmSettings.cpp
/lastfm/LastFmSettings.h
/lastfm/libUnicorn
/lastfm/meta
/lastfm/MooseCommon.h
/lastfm/RadioAdapter.cpp
/lastfm/RadioAdapter.h
/lastfm/README
/lastfm/ScrobblerAdapter.cpp
/lastfm/ScrobblerAdapter.h
/lastfm/Settings.h
/lastfm/SimilarArtistsAction.cpp
/lastfm/SimilarArtistsAction.h
/magnatune/amarok_service_magnatunestore.desktop
/magnatune/amarok_service_magnatunestore_config.desktop
/magnatune/CMakeLists.txt
/magnatune/MagnatuneAlbumDownloader.cpp
/magnatune/MagnatuneAlbumDownloader.h
/magnatune/MagnatuneCollectionLocation.cpp
/magnatune/MagnatuneCollectionLocation.h
/magnatune/MagnatuneConfig.cpp
/magnatune/MagnatuneConfig.h
/magnatune/MagnatuneConfigWidget.ui
/magnatune/MagnatuneDatabaseHandler.cpp
/magnatune/MagnatuneDatabaseHandler.h
/magnatune/MagnatuneDatabaseWorker.cpp
/magnatune/MagnatuneDatabaseWorker.h
/magnatune/MagnatuneDownloadDialog.cpp
/magnatune/MagnatuneDownloadDialog.h
/magnatune/MagnatuneDownloadDialogBase.ui
/magnatune/MagnatuneDownloadInfo.cpp
/magnatune/MagnatuneDownloadInfo.h
/magnatune/MagnatuneInfoParser.cpp
/magnatune/MagnatuneInfoParser.h
/magnatune/MagnatuneMeta.cpp
/magnatune/MagnatuneMeta.h
/magnatune/MagnatunePurchaseDialog.cpp
/magnatune/MagnatunePurchaseDialog.h
/magnatune/MagnatunePurchaseDialogBase.ui
/magnatune/MagnatunePurchaseHandler.cpp
/magnatune/MagnatunePurchaseHandler.h
/magnatune/MagnatuneRedownloadDialog.cpp
/magnatune/MagnatuneRedownloadDialog.h
/magnatune/MagnatuneRedownloadDialogBase.ui
/magnatune/MagnatuneRedownloadHandler.cpp
/magnatune/MagnatuneRedownloadHandler.h
/magnatune/MagnatuneSettingsModule.cpp
/magnatune/MagnatuneSettingsModule.h
/magnatune/MagnatuneSqlCollection.cpp
/magnatune/MagnatuneSqlCollection.h
/magnatune/MagnatuneStore.cpp
/magnatune/MagnatuneStore.h
/magnatune/MagnatuneXmlParser.cpp
/magnatune/MagnatuneXmlParser.h
/mp3tunes/amarok_service_mp3tunes.desktop
/mp3tunes/amarok_service_mp3tunes_config.desktop
/mp3tunes/CMakeLists.txt
/mp3tunes/harmonydaemon
/mp3tunes/libmp3tunes
/mp3tunes/Mp3tunesConfig.cpp
/mp3tunes/Mp3tunesConfig.h
/mp3tunes/Mp3tunesConfigWidget.ui
/mp3tunes/Mp3tunesHarmonyHandler.cpp
/mp3tunes/Mp3tunesHarmonyHandler.h
/mp3tunes/Mp3tunesLocker.cpp
/mp3tunes/Mp3tunesLocker.h
/mp3tunes/Mp3tunesLockerMeta.cpp
/mp3tunes/Mp3tunesLockerMeta.h
/mp3tunes/Mp3tunesMeta.cpp
/mp3tunes/Mp3tunesMeta.h
/mp3tunes/Mp3tunesService.cpp
/mp3tunes/Mp3tunesService.h
/mp3tunes/Mp3tunesServiceCollection.cpp
/mp3tunes/Mp3tunesServiceCollection.h
/mp3tunes/Mp3tunesServiceCollectionLocation.cpp
/mp3tunes/Mp3tunesServiceCollectionLocation.h
/mp3tunes/Mp3tunesServiceQueryMaker.cpp
/mp3tunes/Mp3tunesServiceQueryMaker.h
/mp3tunes/Mp3tunesSettingsModule.cpp
/mp3tunes/Mp3tunesSettingsModule.h
/mp3tunes/Mp3tunesWorkers.cpp
/mp3tunes/Mp3tunesWorkers.h
/mp3tunes/org.kde.amarok.Mp3tunesHarmonyHandler.xml
/opmldirectory/amarok_service_opmldirectory.desktop
/opmldirectory/CMakeLists.txt
/opmldirectory/OpmlDirectoryDatabaseHandler.cpp
/opmldirectory/OpmlDirectoryDatabaseHandler.h
/opmldirectory/OpmlDirectoryInfoParser.cpp
/opmldirectory/OpmlDirectoryInfoParser.h
/opmldirectory/OpmlDirectoryMeta.cpp
/opmldirectory/OpmlDirectoryMeta.h
/opmldirectory/OpmlDirectoryService.cpp
/opmldirectory/OpmlDirectoryService.h
/opmldirectory/OpmlDirectoryXmlParser.cpp
/opmldirectory/OpmlDirectoryXmlParser.h
/scriptable/ScriptableService.cpp
/scriptable/ScriptableService.h
/scriptable/ScriptableServiceCollection.cpp
/scriptable/ScriptableServiceCollection.h
/scriptable/ScriptableServiceInfoParser.cpp
/scriptable/ScriptableServiceInfoParser.h
/scriptable/ScriptableServiceManager.cpp
/scriptable/ScriptableServiceManager.h
/scriptable/ScriptableServiceMeta.cpp
/scriptable/ScriptableServiceMeta.h
/scriptable/ScriptableServiceQueryMaker.cpp
/scriptable/ScriptableServiceQueryMaker.h
/scriptable/shoutcast_service.rb
/shoutcast/amarok_service_shoutcast.desktop
/shoutcast/CMakeLists.txt
/shoutcast/ShoutcastMeta.cpp
/shoutcast/ShoutcastMeta.h
/shoutcast/ShoutcastService.cpp
/shoutcast/ShoutcastService.h
/shoutcast/ShoutcastServiceCollection.cpp
/shoutcast/ShoutcastServiceCollection.h
/shoutcast/ShoutcastServiceQueryMaker.cpp
/shoutcast/ShoutcastServiceQueryMaker.h
/lastfm/core/exceptions.h
/lastfm/core/Radio.cpp
/lastfm/core/Radio.h
/lastfm/core/RadioEnums.h
/lastfm/core/RadioPlaylist.cpp
/lastfm/core/RadioPlaylist.h
/lastfm/core/Scrobbler-12.cpp
/lastfm/core/Scrobbler-12.h
/lastfm/core/XspfResolver.cpp
/lastfm/core/XspfResolver.h
/lastfm/libUnicorn/CachedHttp.cpp
/lastfm/libUnicorn/CachedHttp.h
/lastfm/libUnicorn/CachedHttpJanitor.cpp
/lastfm/libUnicorn/CachedHttpJanitor.h
/lastfm/libUnicorn/CocoaWatcher.h
/lastfm/libUnicorn/CocoaWatcher.mm
/lastfm/libUnicorn/draglabel.cpp
/lastfm/libUnicorn/draglabel.h
/lastfm/libUnicorn/DragMimeData.cpp
/lastfm/libUnicorn/DragMimeData.h
/lastfm/libUnicorn/imagebutton.cpp
/lastfm/libUnicorn/imagebutton.h
/lastfm/libUnicorn/LastMessageBox.cpp
/lastfm/libUnicorn/LastMessageBox.h
/lastfm/libUnicorn/logger.cpp
/lastfm/libUnicorn/logger.h
/lastfm/libUnicorn/mbid_mp3.h
/lastfm/libUnicorn/metadata.cpp
/lastfm/libUnicorn/metadata.h
/lastfm/libUnicorn/RedirectHttp.cpp
/lastfm/libUnicorn/RedirectHttp.h
/lastfm/libUnicorn/Station.h
/lastfm/libUnicorn/StationUrl.cpp
/lastfm/libUnicorn/StationUrl.h
/lastfm/libUnicorn/StopWatch.cpp
/lastfm/libUnicorn/StopWatch.h
/lastfm/libUnicorn/Track.h
/lastfm/libUnicorn/TrackInfo.cpp
/lastfm/libUnicorn/TrackInfo.h
/lastfm/libUnicorn/UnicornCommon.cpp
/lastfm/libUnicorn/UnicornCommon.h
/lastfm/libUnicorn/UnicornCommonMac.cpp
/lastfm/libUnicorn/UnicornCommonMac.h
/lastfm/libUnicorn/UnicornCommonWin.cpp
/lastfm/libUnicorn/UnicornCommonWin.h
/lastfm/libUnicorn/UnicornDllExportMacro.h
/lastfm/libUnicorn/URLLabel.cpp
/lastfm/libUnicorn/URLLabel.h
/lastfm/libUnicorn/watermarkwidget.cpp
/lastfm/libUnicorn/watermarkwidget.h
/lastfm/libUnicorn/WebService
/lastfm/libUnicorn/WebService.cpp
/lastfm/libUnicorn/WebService.h
/lastfm/libUnicorn/WeightedString.h
/lastfm/libUnicorn/WeightedStringList.h
/lastfm/libUnicorn/zconf.h
/lastfm/libUnicorn/zlib.h
/lastfm/meta/CurrentTrackActionsCapabilityImpl_p.h
/lastfm/meta/LastFmCapabilityImpl_p.h
/lastfm/meta/LastFmMeta.cpp
/lastfm/meta/LastFmMeta.h
/lastfm/meta/LastFmMeta_p.h
/lastfm/meta/LastFmStreamInfoCapability.cpp
/lastfm/meta/LastFmStreamInfoCapability.h
/lastfm/meta/MultiPlayableCapabilityImpl_p.h
/mp3tunes/harmonydaemon/AmarokClient.cpp
/mp3tunes/harmonydaemon/AmarokClient.h
/mp3tunes/harmonydaemon/main.cpp
/mp3tunes/harmonydaemon/Mp3tunesHarmonyClient.cpp
/mp3tunes/harmonydaemon/Mp3tunesHarmonyClient.h
/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.cpp
/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.h
/mp3tunes/harmonydaemon/Mp3tunesHarmonyDownload.cpp
/mp3tunes/harmonydaemon/Mp3tunesHarmonyDownload.h
/mp3tunes/harmonydaemon/org.kde.amarok.Mp3tunesHarmonyDaemon.xml
/mp3tunes/libmp3tunes/harmony.c
/mp3tunes/libmp3tunes/harmony.h
/mp3tunes/libmp3tunes/locker.c
/mp3tunes/libmp3tunes/locker.h
/mp3tunes/libmp3tunes/md5.c
/mp3tunes/libmp3tunes/md5.h
/mp3tunes/libmp3tunes/README
/lastfm/libUnicorn/WebService/ActionRequest.cpp
/lastfm/libUnicorn/WebService/AlbumTagsRequest.cpp
/lastfm/libUnicorn/WebService/ArtistMetaDataRequest.cpp
/lastfm/libUnicorn/WebService/ArtistTagsRequest.cpp
/lastfm/libUnicorn/WebService/ChangeStationRequest.cpp
/lastfm/libUnicorn/WebService/DeleteFriendRequest.cpp
/lastfm/libUnicorn/WebService/FingerprintQueryRequest.cpp
/lastfm/libUnicorn/WebService/FriendsRequest.cpp
/lastfm/libUnicorn/WebService/FrikkinNormanRequest.cpp
/lastfm/libUnicorn/WebService/FrikkinNormanRequest.h
/lastfm/libUnicorn/WebService/fwd.h
/lastfm/libUnicorn/WebService/GetXspfPlaylistRequest.cpp
/lastfm/libUnicorn/WebService/Handshake.cpp
/lastfm/libUnicorn/WebService/NeighboursRequest.cpp
/lastfm/libUnicorn/WebService/ProxyTestRequest.cpp
/lastfm/libUnicorn/WebService/RecentTrackRequest.cpp
/lastfm/libUnicorn/WebService/RecommendRequest.cpp
/lastfm/libUnicorn/WebService/ReportRebufferingRequest.cpp
/lastfm/libUnicorn/WebService/Request.cpp
/lastfm/libUnicorn/WebService/Request.h
/lastfm/libUnicorn/WebService/SearchTagsRequest.cpp
/lastfm/libUnicorn/WebService/SetTagRequest.cpp
/lastfm/libUnicorn/WebService/SimilarArtistsRequest.cpp
/lastfm/libUnicorn/WebService/SimilarTagsRequest.cpp
/lastfm/libUnicorn/WebService/SubmitFullFingerprintRequest.cpp
/lastfm/libUnicorn/WebService/TopTagsRequest.cpp
/lastfm/libUnicorn/WebService/TrackMetaDataRequest.cpp
/lastfm/libUnicorn/WebService/TrackTagsRequest.cpp
/lastfm/libUnicorn/WebService/TrackToIdRequest.cpp
/lastfm/libUnicorn/WebService/TrackToIdRequest.h
/lastfm/libUnicorn/WebService/TrackUploadRequest.cpp
/lastfm/libUnicorn/WebService/TrackUploadRequest.h
/lastfm/libUnicorn/WebService/UserLabelsRequest.cpp
/lastfm/libUnicorn/WebService/UserLabelsRequest.h
/lastfm/libUnicorn/WebService/UserPicturesRequest.cpp
/lastfm/libUnicorn/WebService/UserTagsRequest.cpp
/lastfm/libUnicorn/WebService/VerifyUserRequest.cpp
/lastfm/libUnicorn/WebService/XmlRpc.cpp
/lastfm/libUnicorn/WebService/XmlRpc.h

Deleted 43 files

/trunk/extragear/multimedia/amarok/src/browsers/servicebrowser
/ampache
/CMakeLists.txt
/DynamicServiceQueryMaker.cpp
/DynamicServiceQueryMaker.h
/InfoParserBase.cpp
/InfoParserBase.h
/jamendo
/lastfm
/magnatunestore
/mp3tunes
/opmldirectory
/scriptableservice
/ServiceAlbumCoverDownloader.cpp
/ServiceAlbumCoverDownloader.h
/ServiceBase.cpp
/ServiceBase.h
/ServiceCollection.cpp
/ServiceCollection.h
/ServiceCollectionLocation.cpp
/ServiceCollectionLocation.h
/ServiceCollectionTreeView.cpp
/ServiceCollectionTreeView.h
/ServiceCurrentTrackActionsCapability.cpp
/ServiceCustomActionsCapability.cpp
/ServiceCustomActionsCapability.h
/ServiceInfoObserver.h
/ServiceInfoProxy.cpp
/ServiceInfoProxy.h
/ServiceMetaBase.cpp
/ServiceMetaBase.h
/ServicePluginManager.cpp
/ServicePluginManager.h
/ServiceSourceInfoCapability.cpp
/ServiceSourceInfoCapability.h
/ServiceSqlCollection.cpp
/ServiceSqlCollection.h
/ServiceSqlQueryMaker.cpp
/ServiceSqlQueryMaker.h
/ServiceSqlRegistry.cpp
/ServiceSqlRegistry.h
/shoutcast
/ShowInServiceAction.cpp
/ShowInServiceAction.h

Modified 16 files

/trunk/extragear/multimedia/amarok/src
/CMakeLists.txt
/MainWindow.cpp
/dialogs/ScriptManager.cpp
/scriptengine/AmarokScriptableServiceScript.cpp
/scriptengine/AmarokServicePluginManagerScript.cpp
/browsers/collectionbrowser/CollectionTreeView.h
/browsers/playlistbrowser/PodcastCategory.cpp
/browsers/servicebrowser/ServiceBrowser.h
/browsers/servicebrowser/ServiceListDelegate.cpp
/browsers/servicebrowser/ServiceListModel.h
/collection/sqlcollection/SqlMeta.cpp
/configdialog/dialogs/ServiceConfig.h
/context/engines/cloud/CloudEngine.cpp
/context/engines/cloud/CloudEngine.h
/context/engines/service/ServiceEngine.cpp
/context/engines/service/ServiceEngine.h

388 files changed in total