- save a bit of memory by caching a pixmap instead

2 files changed, 25 insertions, 25 deletions

diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index e9fb5a6..d6f4080 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -27,49 +27,49 @@
 #include <qmap.h>
 #include <qtimer.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <assert.h>
 
 struct SkinData
 {
     typedef QMap<QString, QImage> ButtonMaskImageMap;
 
-    QImage backgroundImage;
+    QPixmap backgroundPixmap;
     QImage buttonUpImage;
     QImage buttonDownImage;
     QImage buttonMask;
     ButtonMaskImageMap buttonMasks;
 };
 
 class SkinCache : public Singleton<SkinCache>
 {
 public:
     SkinCache();
 
     SkinData *lookupAndTake( const QString &skinPath, const QString &fileNameInfix );
 
     void store( const QString &skinPath, const QString &fileNameInfix, SkinData *data );
 
 private:
     typedef QCache<SkinData> DataCache;
-    typedef QCache<QImage> BackgroundImageCache;
+    typedef QCache<QPixmap> BackgroundPixmapCache;
 
     template <class CacheType>
     void store( const QCache<CacheType> &cache, const QString &key, CacheType *data );
 
     DataCache m_cache;
-    BackgroundImageCache m_backgroundImageCache;
+    BackgroundPixmapCache m_backgroundPixmapCache;
 };
 
 Skin::Skin( const QString &name, const QString &fileNameInfix )
     : m_fileNameInfix( fileNameInfix )
 {
     init( name );
 }
 
 Skin::Skin( const QString &fileNameInfix )
     : m_fileNameInfix( fileNameInfix )
 {
     init( defaultSkinName() );
@@ -79,35 +79,35 @@ Skin::~Skin()
 {
     SkinCache::self().store( m_skinPath, m_fileNameInfix, d );
 }
 
 void Skin::init( const QString &name )
 {
     m_skinPath = "opieplayer2/skins/" + name;
     d = SkinCache::self().lookupAndTake( m_skinPath, m_fileNameInfix );
 }
 
 void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount )
 {
-    backgroundImage();
+    backgroundPixmap();
     buttonUpImage();
     buttonDownImage();
     ( void )buttonMask( skinButtonInfo, buttonCount );
 }
 
-QImage Skin::backgroundImage() const
+QPixmap Skin::backgroundPixmap() const
 {
-    if ( d->backgroundImage.isNull() )
-        d->backgroundImage = loadImage( QString( "%1/background" ).arg( m_skinPath ) );
-    return d->backgroundImage;
+    if ( d->backgroundPixmap.isNull() )
+        d->backgroundPixmap = loadImage( QString( "%1/background" ).arg( m_skinPath ) );
+    return d->backgroundPixmap;
 }
 
 QImage Skin::buttonUpImage() const
 {
     if ( d->buttonUpImage.isNull() )
         d->buttonUpImage = loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
     return d->buttonUpImage;
 }
 
 QImage Skin::buttonDownImage() const
 {
     if ( d->buttonDownImage.isNull() )
@@ -164,77 +164,77 @@ QString Skin::defaultSkinName()
 }
 
 QImage Skin::loadImage( const QString &fileName )
 {
     return QImage( Resource::findPixmap( fileName ) );
 }
 
 SkinCache::SkinCache()
 {
     // let's say we cache two skins (audio+video) at maximum
     m_cache.setMaxCost( 2 );
     // ... and one background pixmap
-    m_backgroundImageCache.setMaxCost( 1 );
+    m_backgroundPixmapCache.setMaxCost( 1 );
 }
 
 SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &fileNameInfix )
 {
     QString key = skinPath + fileNameInfix;
 
     SkinData *data = m_cache.take( key );
     if ( !data )
         data = new SkinData;
     else
         qDebug( "SkinCache: hit" );
 
-    QImage *bgImage = m_backgroundImageCache.find( skinPath );
-    if ( bgImage ) {
-        qDebug( "SkinCache: hit on bgimage" );
-        data->backgroundImage = *bgImage;
+    QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath );
+    if ( bgPixmap ) {
+        qDebug( "SkinCache: hit on bgpixmap" );
+        data->backgroundPixmap = *bgPixmap;
     }
     else
-        data->backgroundImage = QImage();
+        data->backgroundPixmap = QPixmap();
 
     return data;
 }
 
 void SkinCache::store( const QString &skinPath, const QString &fileNameInfix, SkinData *data )
 {
-    QImage *backgroundImage = new QImage( data->backgroundImage );
+    QPixmap *backgroundPixmap = new QPixmap( data->backgroundPixmap );
 
-    data->backgroundImage = QImage();
+    data->backgroundPixmap = QPixmap();
 
     QString key = skinPath + fileNameInfix;
 
     if ( m_cache.find( key, false /*ref*/ ) != 0 ||
          !m_cache.insert( key, data ) )
         delete data;
 
-    if ( m_backgroundImageCache.find( skinPath, false /*ref*/ ) != 0 ||
-         !m_backgroundImageCache.insert( skinPath, backgroundImage ) )
-        delete backgroundImage;
+    if ( m_backgroundPixmapCache.find( skinPath, false /*ref*/ ) != 0 ||
+         !m_backgroundPixmapCache.insert( skinPath, backgroundPixmap ) )
+        delete backgroundPixmap;
 }
 
 SkinLoader::IncrementalLoader::IncrementalLoader( const Info &info )
     : m_skin( info.skinName, info.fileNameInfix ), m_info( info )
 {
-    m_currentState = LoadBackgroundImage;
+    m_currentState = LoadBackgroundPixmap;
 }
 
 SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadStep()
 {
     switch ( m_currentState ) {
-        case LoadBackgroundImage:
-            qDebug( "load bgimage" );
-            m_skin.backgroundImage();
+        case LoadBackgroundPixmap:
+            qDebug( "load bgpixmap" );
+            m_skin.backgroundPixmap();
             m_currentState = LoadButtonUpImage;
             break;
         case LoadButtonUpImage:
             qDebug( "load upimage" );
             m_skin.buttonUpImage();
             m_currentState = LoadButtonDownImage;
             break;
         case LoadButtonDownImage:
             qDebug( "load downimage" );
             m_skin.buttonDownImage();
             m_currentState = LoadButtonMasks;
             m_currentButton = 0;
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index a43a1d0..90062c2 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -31,25 +31,25 @@
 
 struct SkinData;
 
 class Skin
 {
 public:
     Skin( const QString &name, const QString &fileNameInfix );
     Skin( const QString &fileNameInfix );
     ~Skin();
 
     void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount );
 
-    QImage backgroundImage() const;
+    QPixmap backgroundPixmap() const;
     QImage buttonUpImage() const;
     QImage buttonDownImage() const;
 
     QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const;
 
     QImage buttonMaskImage( const QString &fileName ) const;
 
     static QString defaultSkinName();
 
 private:
     void init( const QString &name );
 
@@ -97,25 +97,25 @@ private:
     typedef QValueList<Info> InfoList;
 
     class IncrementalLoader
     {
     public:
         enum LoaderResult { LoadingCompleted, MoreToCome };
 
         IncrementalLoader( const Info &info );
 
         LoaderResult loadStep();
 
     private:
-        enum State { LoadBackgroundImage, LoadButtonUpImage, LoadButtonDownImage, LoadButtonMasks, LoadButtonMask };
+        enum State { LoadBackgroundPixmap, LoadButtonUpImage, LoadButtonDownImage, LoadButtonMasks, LoadButtonMask };
 
         Skin m_skin;
         Info m_info;
         State m_currentState;
         uint m_currentButton;
     };
 
     InfoList pendingSkins;
     IncrementalLoader *m_currentLoader;
     int m_timerId;
 };