Revision 687904

Go back to digest for 15th July 2007

Other in Multimedia

Leo Franchi committed changes in /branches/work/amarok-plasmify/src:

changed the plasma dealio so now we svn extern the plasma dir from kdebase/workspace/libs/plasma. plasma is compiled as a library and linked to. i made a bunch of wrapper files in context/ that typedef Plasma::foo to Context::foo, for convenience. as time goes on and we need to extend plasma, a full subclass can replate the typedef.

NOTE: re: my email to asiego and amarok-devel@, i have made a few very trivial changes to the plasma/ source. basically, i changed the hardcoded paths so it looks for amarok applets/engines instead of plasma ones. also, the CMakeLists file has been modified to suit our needs. as i have of course not committed these to the plasma source, this build *will not* find amarok context applets/engines unless you apply the proper patch, which can be found at:

<a href=""></a>;

some other changes, including addition of lyrics engine (untested, needs work), wikipedia engine (untested, but should work), as well as addition of AMAROK_EXPORT to relevant amarok classes that needed it (any class referenced by an engine or applet needs to be exported. also, changes to the theme, as well as applet. also removed all kde4_automocs. amarokengineexplorer removed as it was not really useful at all.

and finally.... i probably forgot to commit something. so if it breaks, please tell me!

File Changes

Added 11 files
  • /branches/work/amarok-plasmify/src
  •   /context/engines/lyrics
  •   /context/engines/wikipedia
  •   /context/engines/lyrics/amarok-data-engine-lyrics.desktop
  •   /context/engines/lyrics/CMakeLists.txt
  •   /context/engines/lyrics/LyricsEngine.cpp
  •   /context/engines/lyrics/LyricsEngine.h
  •   /context/engines/wikipedia/amarok-data-engine-wikipedia.desktop
  •   /context/engines/wikipedia/CMakeLists.txt
  •   /context/engines/wikipedia/WikipediaEngine.cpp
  •   /context/engines/wikipedia/WikipediaEngine.h
  •   /themes/context/default/widgets/background.svg
Deleted 2 files
  • /branches/work/amarok-plasmify/src/context
  •   /engineexplorer
  •   /widgets
Modified 52 files
  • /branches/work/amarok-plasmify/src
  •   /CMakeLists.txt
  •   /collectiondb.h
  •   /context
  •   /enginecontroller.h
  •   /metabundle.h
  •   /playlistwindow.cpp
  •   /playlistwindow.h
  •   /querybuilder.h
  •   /scriptmanager.h
  •   /collectionscanner/CMakeLists.txt
  •   /context/Applet.cpp
  •   /context/Applet.h
  •   /context/CMakeLists.txt
  •   /context/Context.h
  •   /context/ContextScene.cpp
  •   /context/ContextScene.h
  •   /context/ContextView.cpp
  •   /context/ContextView.h
  •   /context/ControlBox.cpp
  •   /context/DataEngine.h
  •   /context/DataEngineManager.cpp
  •   /context/DataEngineManager.h
  •   /context/DataSource.h
  •   /context/Svg.h
  •   /context/Theme.h
  •   /konquisidebar/CMakeLists.txt
  •   /metadata/CMakeLists.txt
  •   /servicebrowser/CMakeLists.txt
  •   /themes/CMakeLists.txt
  •   /collection/daap/CMakeLists.txt
  •   /collection/sqlcollection/CMakeLists.txt
  •   /context/engines/CMakeLists.txt
  •   /device/massstorage/CMakeLists.txt
  •   /device/nfs/CMakeLists.txt
  •   /device/smb/CMakeLists.txt
  •   /engine/gst10/CMakeLists.txt
  •   /engine/phonon/CMakeLists.txt
  •   /engine/void/CMakeLists.txt
  •   /engine/xine/CMakeLists.txt
  •   /mediadevice/generic/CMakeLists.txt
  •   /mediadevice/ifp/CMakeLists.txt
  •   /mediadevice/ipod/CMakeLists.txt
  •   /mediadevice/njb/CMakeLists.txt
  •   /vis/libvisual/CMakeLists.txt
  •   /context/applets/lastfmevents/CMakeLists.txt
  •   /context/applets/lastfmevents/LastFmEvents.cpp
  •   /context/applets/lastfmevents/LastFmEvents.h
  •   /context/applets/test/CMakeLists.txt
  •   /context/applets/test/Test.cpp
  •   /context/engines/lastfm/LastFmEngine.cpp
  •   /context/engines/lastfm/LastFmEngine.h
  •   /themes/context/default/CMakeLists.txt
65 files changed in total