-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 16 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index 9ad5f3f..06453f9 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp | |||
@@ -20,8 +20,9 @@ | |||
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "skin.h" | 23 | #include "skin.h" |
24 | #include "singleton.h" | ||
24 | 25 | ||
25 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
26 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
27 | 28 | ||
@@ -37,8 +38,23 @@ struct SkinData | |||
37 | QImage buttonMask; | 38 | QImage buttonMask; |
38 | ButtonMaskImageMap buttonMasks; | 39 | ButtonMaskImageMap buttonMasks; |
39 | }; | 40 | }; |
40 | 41 | ||
42 | class SkinCache : public Singleton<SkinCache> | ||
43 | { | ||
44 | public: | ||
45 | SkinCache(); | ||
46 | |||
47 | QImage loadImage( const QString &name ); | ||
48 | |||
49 | private: | ||
50 | typedef QDict<QImage> ImageCache; | ||
51 | |||
52 | ImageCache m_cache; | ||
53 | |||
54 | ThreadUtil::Mutex m_cacheGuard; | ||
55 | }; | ||
56 | |||
41 | Skin::Skin( const QString &name, const QString &fileNameInfix ) | 57 | Skin::Skin( const QString &name, const QString &fileNameInfix ) |
42 | : m_fileNameInfix( fileNameInfix ) | 58 | : m_fileNameInfix( fileNameInfix ) |
43 | { | 59 | { |
44 | init( name ); | 60 | init( name ); |
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h index 5ab6574..060ff73 100644 --- a/noncore/multimedia/opieplayer2/skin.h +++ b/noncore/multimedia/opieplayer2/skin.h | |||
@@ -29,9 +29,8 @@ | |||
29 | #include <qdict.h> | 29 | #include <qdict.h> |
30 | 30 | ||
31 | #include "mediawidget.h" | 31 | #include "mediawidget.h" |
32 | #include "threadutil.h" | 32 | #include "threadutil.h" |
33 | #include "singleton.h" | ||
34 | 33 | ||
35 | struct SkinData; | 34 | struct SkinData; |
36 | 35 | ||
37 | class Skin | 36 | class Skin |
@@ -66,23 +65,8 @@ private: | |||
66 | Skin( const Skin & ); | 65 | Skin( const Skin & ); |
67 | Skin &operator=( const Skin & ); | 66 | Skin &operator=( const Skin & ); |
68 | }; | 67 | }; |
69 | 68 | ||
70 | class SkinCache : public Singleton<SkinCache> | ||
71 | { | ||
72 | public: | ||
73 | SkinCache(); | ||
74 | |||
75 | QImage loadImage( const QString &name ); | ||
76 | |||
77 | private: | ||
78 | typedef QDict<QImage> ImageCache; | ||
79 | |||
80 | ImageCache m_cache; | ||
81 | |||
82 | ThreadUtil::Mutex m_cacheGuard; | ||
83 | }; | ||
84 | |||
85 | class SkinLoader : public ThreadUtil::Thread | 69 | class SkinLoader : public ThreadUtil::Thread |
86 | { | 70 | { |
87 | public: | 71 | public: |
88 | SkinLoader(); | 72 | SkinLoader(); |