summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-11 17:50:15 (UTC)
committer simon <simon>2002-12-11 17:50:15 (UTC)
commit7c897dfbee81f0fabce4b1a8de4ebab70f3783ee (patch) (side-by-side diff)
treeec8571ae41c07f78ec697b57f42ebb2d3af947b2
parent483e550c75f935706fde4e0ca29c4486aeca09a0 (diff)
downloadopie-7c897dfbee81f0fabce4b1a8de4ebab70f3783ee.zip
opie-7c897dfbee81f0fabce4b1a8de4ebab70f3783ee.tar.gz
opie-7c897dfbee81f0fabce4b1a8de4ebab70f3783ee.tar.bz2
- restructing a bit the skin data storage, in preparation for cache
improvements
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp57
-rw-r--r--noncore/multimedia/opieplayer2/skin.h11
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
@@ -26,8 +26,19 @@
#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 );
@@ -38,11 +49,17 @@ Skin::Skin( const QString &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 )
{
@@ -53,64 +70,64 @@ void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint butt
}
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;
}
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
@@ -31,13 +31,16 @@
#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;
@@ -57,15 +60,9 @@ private:
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 & );
};