-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 46 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 4 |
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 @@ -35,9 +35,9 @@ struct SkinData { typedef QMap<QString, QImage> ButtonMaskImageMap; - QImage backgroundImage; + QPixmap backgroundPixmap; QImage buttonUpImage; QImage buttonDownImage; QImage buttonMask; ButtonMaskImageMap buttonMasks; @@ -53,15 +53,15 @@ public: 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 ) @@ -87,19 +87,19 @@ void Skin::init( const QString &name ) } 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 { @@ -172,9 +172,9 @@ 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 ) { @@ -185,48 +185,48 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file 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" ); 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 @@ -39,9 +39,9 @@ public: ~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; @@ -105,9 +105,9 @@ private: 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; |