summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-11 20:26:47 (UTC)
committer simon <simon>2002-12-11 20:26:47 (UTC)
commitc5737bbbe357ea7481a9f6a406ef81bbeba0d541 (patch) (side-by-side diff)
tree62a970f2a18c0cb84c056545da729f71c8005bad
parentb433feb7b048d5155e085c12f88ac5531d045140 (diff)
downloadopie-c5737bbbe357ea7481a9f6a406ef81bbeba0d541.zip
opie-c5737bbbe357ea7481a9f6a406ef81bbeba0d541.tar.gz
opie-c5737bbbe357ea7481a9f6a406ef81bbeba0d541.tar.bz2
- make the cache work as expected
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp39
1 files changed, 35 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 5013bb4..0f49862 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -32,52 +32,55 @@
#include <assert.h>
struct SkinData
{
typedef QMap<QString, QImage> ButtonMaskImageMap;
QImage backgroundImage;
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<QPixmap> BackgroundPixmapCache;
+ typedef QCache<QImage> BackgroundImageCache;
+
+ template <class CacheType>
+ void store( const QCache<CacheType> &cache, const QString &key, CacheType *data );
DataCache m_cache;
- BackgroundPixmapCache m_backgroundPixmapCache;
+ BackgroundImageCache m_backgroundImageCache;
};
Skin::Skin( const QString &name, const QString &fileNameInfix )
: m_fileNameInfix( fileNameInfix )
{
init( name );
}
Skin::Skin( const QString &fileNameInfix )
: m_fileNameInfix( fileNameInfix )
{
init( defaultSkinName() );
}
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 );
}
@@ -145,58 +148,86 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const
{
SkinData::ButtonMaskImageMap::Iterator it = d->buttonMasks.find( fileName );
if ( it == d->buttonMasks.end() ) {
QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
QString path = prefix + fileName + ".png";
it = d->buttonMasks.insert( fileName, loadImage( path ) );
}
return *it;
}
QString Skin::defaultSkinName()
{
Config cfg( "OpiePlayer" );
cfg.setGroup( "Options" );
return cfg.readEntry( "Skin", "default" );
}
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 );
}
SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &fileNameInfix )
{
- return new SkinData;
+ QString key = skinPath + fileNameInfix;
+
+ SkinData *data = m_cache.take( key );
+ if ( !data )
+ data = new SkinData;
+
+ QImage *bgImage = m_backgroundImageCache.find( skinPath );
+ if ( bgImage )
+ data->backgroundImage = *bgImage;
+ else
+ data->backgroundImage = QImage();
+
+ return data;
}
void SkinCache::store( const QString &skinPath, const QString &fileNameInfix, SkinData *data )
{
- delete data;
+ QImage *backgroundImage = new QImage( data->backgroundImage );
+
+ data->backgroundImage = QImage();
+
+ 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;
}
SkinLoader::SkinLoader()
{
}
void SkinLoader::schedule( const QString &skinName, const QString &fileNameInfix,
const MediaWidget::SkinButtonInfo *skinButtonInfo, const uint buttonCount )
{
assert( isRunning() == false );
pendingSkins << Info( skinName, fileNameInfix, skinButtonInfo, buttonCount );
}
void SkinLoader::run()
{
qDebug( "SkinLoader::run()" );
for ( InfoList::ConstIterator it = pendingSkins.begin(); it != pendingSkins.end(); ++it )
load( *it );
qDebug( "SkinLoader is done." );
}
void SkinLoader::load( const Info &nfo )
{