- added a skin cache and a threaded skin loader. looks like the latter

  we have to disable though, because pure image loading with qt is
  anything but threadsafe :(

1 files changed, 52 insertions, 0 deletions

diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 58f1849..c15d9dc 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -4,8 +4,11 @@
 #include <qstring.h>
 #include <qimage.h>
 #include <qmap.h>
+#include <qdict.h>
 
 #include "mediawidget.h"
+#include "threadutil.h"
+#include "singleton.h"
 
 class Skin
 {
@@ -45,6 +48,55 @@ private:
     Skin &operator=( const Skin & );
 };
 
+class SkinCache : public Singleton<SkinCache>
+{
+public:
+    SkinCache();
+
+    QImage loadImage( const QString &name );
+
+private:
+    typedef QDict<QImage> ImageCache;
+
+    ImageCache m_cache;
+
+    ThreadUtil::Mutex m_cacheGuard;
+};
+
+class SkinLoader : public ThreadUtil::Thread
+{
+public:
+    SkinLoader();
+
+    void schedule( const QString &skinName, const QString &fileNameInfix, 
+                   const MediaWidget::SkinButtonInfo *skinButtonInfo, const uint buttonCount );
+
+protected:
+    virtual void run();
+
+private:
+    struct Info
+    {
+        Info() : skinButtonInfo( 0 ), buttonCount( 0 ) {}
+        Info( const QString &_skinName, const QString &_fileNameInfix, 
+              const MediaWidget::SkinButtonInfo *_skinButtonInfo, const uint _buttonCount )
+            : skinName( _skinName ), fileNameInfix( _fileNameInfix ), 
+              skinButtonInfo( _skinButtonInfo ), buttonCount( _buttonCount )
+        {}
+
+        const QString skinName;
+        const QString fileNameInfix;
+        const MediaWidget::SkinButtonInfo *skinButtonInfo;
+        const uint buttonCount;
+    };
+    typedef QValueList<Info> InfoList;
+
+    void load( const Info &nfo );
+
+    InfoList pendingSkins;
+    ThreadUtil::Mutex guard;
+};
+
 #endif // SKIN_H
 /* vim: et sw=4 ts=4
  */