author | simon <simon> | 2002-12-11 19:24:52 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 19:24:52 (UTC) |
commit | e59fabf981834292c2ed9b7192dd4f789cc4b7cb (patch) (side-by-side diff) | |
tree | a2d9bb2b50a1a8ff9bd81d656f59e8df7da6f064 /noncore/multimedia/opieplayer2 | |
parent | 073b2388a8c9bd2cc3b4f98025f5fcda424df1c6 (diff) | |
download | opie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.zip opie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.tar.gz opie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.tar.bz2 |
- disable cache temporarily
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index 06453f9..d2e3b00 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp @@ -75,47 +75,47 @@ void Skin::init( const QString &name ) { m_skinPath = "opieplayer2/skins/" + name; d = new SkinData; } void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) { backgroundImage(); buttonUpImage(); buttonDownImage(); ( void )buttonMask( skinButtonInfo, buttonCount ); } QImage Skin::backgroundImage() const { if ( d->backgroundImage.isNull() ) - d->backgroundImage = SkinCache::self().loadImage( QString( "%1/background" ).arg( m_skinPath ) ); + d->backgroundImage = loadImage( QString( "%1/background" ).arg( m_skinPath ) ); return d->backgroundImage; } QImage Skin::buttonUpImage() const { if ( d->buttonUpImage.isNull() ) - d->buttonUpImage = SkinCache::self().loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); + 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() ) - d->buttonDownImage = SkinCache::self().loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); + d->buttonDownImage = loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); return d->buttonDownImage; } QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const { if ( !d->buttonMask.isNull() ) return d->buttonMask; QSize buttonAreaSize = buttonUpImage().size(); d->buttonMask = QImage( buttonAreaSize, 8, 255 ); d->buttonMask.fill( 0 ); for ( uint i = 0; i < buttonCount; ++i ) addButtonToMask( skinButtonInfo[ i ].command + 1, buttonMaskImage( skinButtonInfo[ i ].fileName ) ); @@ -129,44 +129,49 @@ void Skin::addButtonToMask( int tag, const QImage &maskImage ) const uchar **dest = d->buttonMask.jumpTable(); for ( int y = 0; y < d->buttonMask.height(); y++ ) { uchar *line = dest[y]; for ( int x = 0; x < d->buttonMask.width(); x++ ) if ( !qRed( maskImage.pixel( x, y ) ) ) line[x] = tag; } } 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, SkinCache::self().loadImage( path ) ); + 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() { m_cache.setAutoDelete( true ); } QImage SkinCache::loadImage( const QString &name ) { ThreadUtil::AutoLock lock( m_cacheGuard ); QImage *image = m_cache.find( name ); if ( image ) { qDebug( "cache hit for %s", name.ascii() ); return *image; } image = new QImage( Resource::findPixmap( name ) ); diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h index 060ff73..e55832c 100644 --- a/noncore/multimedia/opieplayer2/skin.h +++ b/noncore/multimedia/opieplayer2/skin.h @@ -44,32 +44,34 @@ public: QImage backgroundImage() 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 ); void addButtonToMask( int tag, const QImage &maskImage ) const; + static QImage loadImage( const QString &fileName ); + QString m_fileNameInfix; QString m_skinPath; SkinData *d; Skin( const Skin & ); Skin &operator=( const Skin & ); }; class SkinLoader : public ThreadUtil::Thread { public: SkinLoader(); void schedule( const QString &skinName, const QString &fileNameInfix, const MediaWidget::SkinButtonInfo *skinButtonInfo, const uint buttonCount ); |