Revision fb3ab32...

Go back to digest for 6th March 2011

Features in Multimedia

Rick Chen committed changes in [amarok] /:

Merge branch 'rickc-pluginselection'

This merge is a refactor of how plugins are managed. The goal was to
make loading all plugins optional (except the db collection plugins).

o plugins include service, device, and collection plugins
o plugins (and scripts) selectors are available in the config dialog
o gui part of ScanManager is taken elsewhere

note: you may need to clean the build directory first.

Conflicts:
src/App.cpp
src/ScriptManager.h
src/context/applets/lyrics/LyricsApplet.cpp
src/core/plugins/Plugin.h
src/dialogs/ScriptManager.cpp
src/scriptengine/AmarokLyricsScript.cpp

File Changes

Added 4 files
  •   src/MountPointManager.cpp
  •   src/core-impl/collections/db/sql/device/massstorage/amarok_device_massstorage.desktop
  •   src/core-impl/collections/db/sql/device/nfs/amarok_device_nfs.desktop
  •   src/core-impl/collections/db/sql/device/smb/amarok_device_smb.desktop
Deleted 2 files
  • /core-impl/collections/db/sql/device
  •   src/nfs/amarok_nfs-device.desktop
  •   src/smb/amarok_smb-device.desktop
Ignored 120 files
  •   release_scripts/bump_plugin_version.rb
  •   src/amarok.knsrc
  •   src/MainWindow.h
  •   src/MountPointManager.h
  •   src/PluginManager.cpp
  •   src/PluginManager.h
  •   src/ScriptManager.cpp
  •   src/ScriptManager.h
  •   src/ScriptUpdater.cpp
  •   src/ScriptUpdater.h
  •   src/configdialog/ConfigDialog.cpp
  •   src/context/DataEngine.h
  •   src/core/CMakeLists.txt
  •   src/dialogs/deviceconfiguredialog.cpp
  •   src/dialogs/ScriptManager.cpp
  •   src/dialogs/ScriptManager.h
  •   src/dialogs/ScriptManagerBase.ui
  •   src/dialogs/ScriptUpdater.cpp
  •   src/dialogs/ScriptUpdater.h
  •   src/scriptengine/AmarokCollectionScript.cpp
  •   src/scriptengine/AmarokCollectionScript.h
  •   src/scriptengine/AmarokEngineScript.cpp
  •   src/scriptengine/AmarokEngineScript.h
  •   src/scriptengine/AmarokInfoScript.cpp
  •   src/scriptengine/AmarokInfoScript.h
  •   src/scriptengine/AmarokOSDScript.cpp
  •   src/scriptengine/AmarokOSDScript.h
  •   src/scriptengine/AmarokPlaylistScript.cpp
  •   src/scriptengine/AmarokPlaylistScript.h
  •   src/scriptengine/AmarokScript.cpp
  •   src/scriptengine/AmarokScript.h
  •   src/scriptengine/AmarokScriptableServiceScript.cpp
  •   src/scriptengine/AmarokScriptConfig.cpp
  •   src/scriptengine/AmarokScriptConfig.h
  •   src/scriptengine/AmarokServicePluginManagerScript.cpp
  •   src/scriptengine/AmarokServicePluginManagerScript.h
  •   src/scriptengine/AmarokStatusbarScript.cpp
  •   src/scriptengine/AmarokStatusbarScript.h
  •   src/scriptengine/AmarokWindowScript.cpp
  •   src/scriptengine/AmarokWindowScript.h
  •   src/scriptengine/MetaTypeExporter.cpp
  •   src/scriptengine/MetaTypeExporter.h
  •   src/scriptengine/ScriptImporter.cpp
  •   src/scriptengine/ScriptImporter.h
  •   src/services/ServiceBase.cpp
  •   src/services/ServiceBase.h
  •   src/services/ServicePluginManager.cpp
  •   src/services/ServicePluginManager.h
  •   src/configdialog/dialogs/PluginsConfig.cpp
  •   src/configdialog/dialogs/PluginsConfig.h
  •   src/configdialog/dialogs/ScriptsConfig.cpp
  •   src/configdialog/dialogs/ScriptsConfig.h
  •   src/configdialog/dialogs/ScriptsConfig.ui
  •   src/configdialog/dialogs/ScriptSelector.cpp
  •   src/configdialog/dialogs/ScriptSelector.h
  •   src/configdialog/dialogs/ServiceConfig.cpp
  •   src/configdialog/dialogs/ServiceConfig.h
  •   src/core/collections/Collection.cpp
  •   src/core/collections/Collection.h
  •   src/core/playlists/PlaylistProvider.h
  •   src/core/plugins/Plugin.cpp
  •   src/core/plugins/Plugin.h
  •   src/core/plugins/PluginConfig.cpp
  •   src/core/plugins/PluginConfig.h
  •   src/core/plugins/PluginManager.cpp
  •   src/core/plugins/PluginManager.h
  •   src/core/support/PluginFactory.cpp
  •   src/core/support/PluginFactory.h
  •   src/services/ampache/AmpacheService.cpp
  •   src/services/ampache/AmpacheService.h
  •   src/services/jamendo/JamendoService.cpp
  •   src/services/jamendo/JamendoService.h
  •   src/services/lastfm/LastFmService.cpp
  •   src/services/lastfm/LastFmService.h
  •   src/services/magnatune/MagnatuneStore.cpp
  •   src/services/magnatune/MagnatuneStore.h
  •   src/services/mp3tunes/Mp3tunesService.cpp
  •   src/services/mp3tunes/Mp3tunesService.h
  •   src/services/scriptable/ScriptableServiceInfoParser.cpp
  •   src/context/applets/currenttrack/CurrentTrack.h
  •   src/context/applets/info/InfoApplet.h
  •   src/context/applets/photos/PhotosApplet.h
  •   src/context/applets/playlistinfo/PlaylistInfo.h
  •   src/context/applets/similarartists/SimilarArtistsApplet.h
  •   src/context/applets/songkick/SongkickApplet.h
  •   src/context/applets/tabs/TabsApplet.h
  •   src/context/applets/upcomingevents/UpcomingEventsApplet.h
  •   src/context/applets/videoclip/VideoclipApplet.cpp
  •   src/context/applets/wikipedia/WikipediaApplet.h
  •   src/context/engines/info/InfoEngine.h
  •   src/context/engines/labels/LabelsEngine.h
  •   src/context/engines/similarartists/SimilarArtistsEngine.cpp
  •   src/context/engines/songkick/SongkickEngine.h
  •   src/context/engines/tabs/TabsEngine.h
  •   src/context/engines/upcomingevents/UpcomingEventsEngine.cpp
  •   src/context/engines/videoclip/VideoclipEngine.h
  •   src/context/engines/wikipedia/WikipediaEngine.h
  •   src/core-impl/collections/daap/DaapCollection.cpp
  •   src/core-impl/collections/db/DatabaseCollection.h
  •   src/core-impl/collections/ipodcollection/IpodCollection.cpp
  •   src/core-impl/collections/mediadevicecollection/MediaDeviceCollection.h
  •   src/core-impl/collections/mtpcollection/MtpCollection.cpp
  •   src/core-impl/collections/nepomukcollection/NepomukCollection.cpp
  •   src/core-impl/collections/playdarcollection/PlaydarCollection.cpp
  •   src/core-impl/collections/support/CollectionManager.h
  •   src/core-impl/collections/umscollection/UmsCollection.cpp
  •   src/core-impl/collections/upnpcollection/UpnpCollectionFactory.cpp
  •   src/core-impl/collections/upnpcollection/UpnpCollectionFactory.h
  •   src/core-impl/collections/db/sql/CMakeLists.txt
  •   src/core-impl/collections/db/sql/MountPointManager.cpp
  •   src/core-impl/collections/db/sql/MountPointManager.h
  •   tests/core-impl/collections/db/sql/SqlMountPointManagerMock.h
  •   src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedCollection.cpp
  •   src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedCollection.h
  •   src/core-impl/collections/db/sql/mysqlservercollection/MySqlServerCollection.cpp
  •   src/core-impl/collections/db/sql/mysqlservercollection/MySqlServerCollection.h
  •   src/core-impl/collections/db/sql/device/massstorage/amarok_massstorage-device.desktop
  •   src/core-impl/collections/db/sql/device/massstorage/CMakeLists.txt
  •   src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.cpp
  •   src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h
Modified 45 files
  •   ChangeLog
  •   src/App.cpp
  •   src/CMakeLists.txt
  •   src/EngineController.cpp
  •   src/MainWindow.cpp
  •   src/context/Applet.h
  •   src/scriptengine/AmarokLyricsScript.cpp
  •   src/scriptengine/AmarokNetworkScript.cpp
  •   src/scriptengine/AmarokNetworkScript.h
  •   src/services/gpodder/GpodderService.cpp
  •   src/services/gpodder/GpodderService.h
  •   src/services/jamendo/amarok_service_jamendo.desktop
  •   src/services/opmldirectory/OpmlDirectoryService.cpp
  •   src/services/opmldirectory/OpmlDirectoryService.h
  •   src/context/applets/albums/Albums.h
  •   src/context/applets/labels/LabelsApplet.h
  •   src/context/applets/lyrics/LyricsApplet.cpp
  •   src/context/applets/lyrics/LyricsApplet.h
  •   src/context/engines/current/CurrentEngine.h
  •   src/context/engines/lyrics/LyricsEngine.h
  •   src/context/engines/photos/PhotosEngine.h
  •   src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.desktop
  •   src/core-impl/collections/audiocd/AudioCdCollection.cpp
  •   src/core-impl/collections/daap/amarok_collection-daapcollection.desktop
  •   src/core-impl/collections/db/ScanManager.cpp
  •   src/core-impl/collections/db/ScanResultProcessor.cpp
  •   src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop
  •   src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.desktop
  •   src/core-impl/collections/mediadevicecollection/MediaDeviceCollection.cpp
  •   src/core-impl/collections/mtpcollection/amarok_collection-mtpcollection.desktop
  •   src/core-impl/collections/nepomukcollection/amarok_collection-nepomukcollection.desktop
  •   src/core-impl/collections/playdarcollection/amarok_collection-playdarcollection.desktop
  •   src/core-impl/collections/support/CollectionManager.cpp
  •   src/core-impl/collections/umscollection/amarok_collection-umscollection.desktop
  •   src/core-impl/collections/upnpcollection/amarok_collection-upnpcollection.desktop
  •   src/core-impl/collections/db/sql/SqlCollection.cpp
  •   src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
  •   src/core-impl/collections/db/sql/mysqlecollection/amarok_collection-mysqlecollection.desktop
  •   src/core-impl/collections/db/sql/mysqlservercollection/amarok_collection-mysqlservercollection.desktop
  •   src/core-impl/collections/db/sql/device/nfs/CMakeLists.txt
  •   src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.cpp
  •   src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h
  •   src/core-impl/collections/db/sql/device/smb/CMakeLists.txt
  •   src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.cpp
  •   src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h
171 files changed in total