4 files changed, 48 insertions, 3 deletions

diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 70ef8d9..617e0fe 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -25,2 +25,3 @@
 #include "playlistwidget.h"
+#include "skin.h"
 
@@ -102,4 +103,6 @@ void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, co
 {
+    Skin skin( name, fileNameInfix );
+
     QString skinPath = "opieplayer2/skins/" + name;
-    backgroundPixmap = QPixmap( Resource::loadPixmap( QString( "%1/background" ).arg( skinPath ) ) );
+    backgroundPixmap = skin.backgroundImage();
     buttonUpImage = QImage( Resource::loadImage( QString( "%1/skin%2_up" ).arg( skinPath ).arg( fileNameInfix ) ) );
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 8d549b6..e1bb879 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -7,3 +7,4 @@ HEADERS   = playlistselection.h mediaplayerstate.h xinecontrol.h \
             frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
-            alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h
+            alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \
+            skin.h
 SOURCES   = main.cpp \
@@ -14,3 +15,4 @@ SOURCES   = main.cpp \
             alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \
-            threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp
+            threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
+            skin.cpp
 TARGET    = opieplayer2
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
new file mode 100644
index 0000000..097b29a
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -0,0 +1,18 @@
+
+#include "skin.h"
+
+#include <qpe/resource.h>
+
+Skin::Skin( const QString &name, const QString &fileNameInfix )
+    : m_name( name ), m_fileNameInfix( fileNameInfix )
+{
+    m_skinPath = "opieplayer2/skins/" + name;
+}
+
+QImage Skin::backgroundImage() const
+{
+    return QImage( Resource::findPixmap( QString( "%1/background" ).arg( m_skinPath ) ) );
+}
+
+/* vim: et sw=4 ts=4
+ */
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
new file mode 100644
index 0000000..3c09e43
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -0,0 +1,22 @@
+#ifndef SKIN_H
+#define SKIN_H
+
+#include <qstring.h>
+#include <qimage.h>
+
+class Skin
+{
+public:
+    Skin( const QString &name, const QString &fileNameInfix );
+
+    QImage backgroundImage() const;
+
+private:
+    QString m_name;
+    QString m_fileNameInfix;
+    QString m_skinPath;
+};
+
+#endif // SKIN_H
+/* vim: et sw=4 ts=4
+ */