| -rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 57 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 11 |
2 files changed, 41 insertions, 27 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index cef3259..9ad5f3f 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp @@ -6,131 +6,148 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "skin.h" #include <qpe/resource.h> #include <qpe/config.h> #include <assert.h> +struct SkinData +{ + typedef QMap<QString, QImage> ButtonMaskImageMap; + + QImage backgroundImage; + QImage buttonUpImage; + QImage buttonDownImage; + QImage buttonMask; + ButtonMaskImageMap buttonMasks; +}; + 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() +{ + delete d; +} + 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 ( m_backgroundImage.isNull() ) - m_backgroundImage = SkinCache::self().loadImage( QString( "%1/background" ).arg( m_skinPath ) ); - return m_backgroundImage; + if ( d->backgroundImage.isNull() ) + d->backgroundImage = SkinCache::self().loadImage( QString( "%1/background" ).arg( m_skinPath ) ); + return d->backgroundImage; } QImage Skin::buttonUpImage() const { - if ( m_buttonUpImage.isNull() ) - m_buttonUpImage = SkinCache::self().loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); - return m_buttonUpImage; + if ( d->buttonUpImage.isNull() ) + d->buttonUpImage = SkinCache::self().loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); + return d->buttonUpImage; } QImage Skin::buttonDownImage() const { - if ( m_buttonDownImage.isNull() ) - m_buttonDownImage = SkinCache::self().loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); - return m_buttonDownImage; + if ( d->buttonDownImage.isNull() ) + d->buttonDownImage = SkinCache::self().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 ( !m_buttonMask.isNull() ) - return m_buttonMask; + if ( !d->buttonMask.isNull() ) + return d->buttonMask; QSize buttonAreaSize = buttonUpImage().size(); - m_buttonMask = QImage( buttonAreaSize, 8, 255 ); - m_buttonMask.fill( 0 ); + 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 ) ); - return m_buttonMask; + return d->buttonMask; } void Skin::addButtonToMask( int tag, const QImage &maskImage ) const { if ( maskImage.isNull() ) return; - uchar **dest = m_buttonMask.jumpTable(); - for ( int y = 0; y < m_buttonMask.height(); y++ ) { + uchar **dest = d->buttonMask.jumpTable(); + for ( int y = 0; y < d->buttonMask.height(); y++ ) { uchar *line = dest[y]; - for ( int x = 0; x < m_buttonMask.width(); x++ ) + 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 { - ButtonMaskImageMap::Iterator it = m_buttonMasks.find( fileName ); - if ( it == m_buttonMasks.end() ) { + 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 = m_buttonMasks.insert( fileName, SkinCache::self().loadImage( path ) ); + it = d->buttonMasks.insert( fileName, SkinCache::self().loadImage( path ) ); } return *it; } QString Skin::defaultSkinName() { Config cfg( "OpiePlayer" ); cfg.setGroup( "Options" ); return cfg.readEntry( "Skin", "default" ); } 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; diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h index 9f7326e..5ab6574 100644 --- a/noncore/multimedia/opieplayer2/skin.h +++ b/noncore/multimedia/opieplayer2/skin.h @@ -11,81 +11,78 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef SKIN_H #define SKIN_H #include <qstring.h> #include <qimage.h> #include <qmap.h> #include <qdict.h> #include "mediawidget.h" #include "threadutil.h" #include "singleton.h" +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; 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; QString m_fileNameInfix; QString m_skinPath; - typedef QMap<QString, QImage> ButtonMaskImageMap; - - mutable QImage m_backgroundImage; - mutable QImage m_buttonUpImage; - mutable QImage m_buttonDownImage; - mutable QImage m_buttonMask; - mutable ButtonMaskImageMap m_buttonMasks; + SkinData *d; Skin( const Skin & ); 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(); |