author | simon <simon> | 2002-12-11 19:34:20 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 19:34:20 (UTC) |
commit | b3373b77e12e4b138848110884aedc37b56384e1 (patch) (unidiff) | |
tree | 7432537024816d316d05fdc364d26db73fae190b /noncore/multimedia | |
parent | e59fabf981834292c2ed9b7192dd4f789cc4b7cb (diff) | |
download | opie-b3373b77e12e4b138848110884aedc37b56384e1.zip opie-b3373b77e12e4b138848110884aedc37b56384e1.tar.gz opie-b3373b77e12e4b138848110884aedc37b56384e1.tar.bz2 |
- SkinCache now operates on SkinData instead of single images
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 37 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 2 |
2 files changed, 18 insertions, 21 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index d2e3b00..5013bb4 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp | |||
@@ -25,2 +25,5 @@ | |||
25 | 25 | ||
26 | #include <qcache.h> | ||
27 | #include <qmap.h> | ||
28 | |||
26 | #include <qpe/resource.h> | 29 | #include <qpe/resource.h> |
@@ -46,10 +49,12 @@ public: | |||
46 | 49 | ||
47 | QImage loadImage( const QString &name ); | 50 | SkinData *lookupAndTake( const QString &skinPath, const QString &fileNameInfix ); |
48 | 51 | ||
49 | private: | 52 | void store( const QString &skinPath, const QString &fileNameInfix, SkinData *data ); |
50 | typedef QDict<QImage> ImageCache; | ||
51 | 53 | ||
52 | ImageCache m_cache; | 54 | private: |
55 | typedef QCache<SkinData> DataCache; | ||
56 | typedef QCache<QPixmap> BackgroundPixmapCache; | ||
53 | 57 | ||
54 | ThreadUtil::Mutex m_cacheGuard; | 58 | DataCache m_cache; |
59 | BackgroundPixmapCache m_backgroundPixmapCache; | ||
55 | }; | 60 | }; |
@@ -70,3 +75,3 @@ Skin::~Skin() | |||
70 | { | 75 | { |
71 | delete d; | 76 | SkinCache::self().store( m_skinPath, m_fileNameInfix, d ); |
72 | } | 77 | } |
@@ -76,3 +81,3 @@ void Skin::init( const QString &name ) | |||
76 | m_skinPath = "opieplayer2/skins/" + name; | 81 | m_skinPath = "opieplayer2/skins/" + name; |
77 | d = new SkinData; | 82 | d = SkinCache::self().lookupAndTake( m_skinPath, m_fileNameInfix ); |
78 | } | 83 | } |
@@ -163,18 +168,12 @@ SkinCache::SkinCache() | |||
163 | { | 168 | { |
164 | m_cache.setAutoDelete( true ); | ||
165 | } | 169 | } |
166 | 170 | ||
167 | QImage SkinCache::loadImage( const QString &name ) | 171 | SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &fileNameInfix ) |
168 | { | 172 | { |
169 | ThreadUtil::AutoLock lock( m_cacheGuard ); | 173 | return new SkinData; |
170 | 174 | } | |
171 | QImage *image = m_cache.find( name ); | ||
172 | if ( image ) { | ||
173 | qDebug( "cache hit for %s", name.ascii() ); | ||
174 | return *image; | ||
175 | } | ||
176 | 175 | ||
177 | image = new QImage( Resource::findPixmap( name ) ); | 176 | void SkinCache::store( const QString &skinPath, const QString &fileNameInfix, SkinData *data ) |
178 | m_cache.insert( name, image ); | 177 | { |
179 | return *image; | 178 | delete data; |
180 | } | 179 | } |
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h index e55832c..9180067 100644 --- a/noncore/multimedia/opieplayer2/skin.h +++ b/noncore/multimedia/opieplayer2/skin.h | |||
@@ -27,4 +27,2 @@ | |||
27 | #include <qimage.h> | 27 | #include <qimage.h> |
28 | #include <qmap.h> | ||
29 | #include <qdict.h> | ||
30 | 28 | ||