Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 14 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 3 |
6 files changed, 24 insertions, 24 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 4db444a..cd5bea4 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -112,12 +112,7 @@ AudioWidget::~AudioWidget() { | |||
112 | } | 112 | } |
113 | 113 | ||
114 | const MediaWidget::SkinButtonInfo *AudioWidget::skinInfo() | 114 | MediaWidget::GUIInfo AudioWidget::guiInfo() |
115 | { | 115 | { |
116 | return ::skinInfo; | 116 | return GUIInfo( QString::null /* infix */, ::skinInfo, ::buttonCount ); |
117 | } | ||
118 | |||
119 | const uint AudioWidget::buttonCount() | ||
120 | { | ||
121 | return ::buttonCount; | ||
122 | } | 117 | } |
123 | 118 | ||
@@ -175,5 +170,5 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { | |||
175 | void AudioWidget::loadSkin() | 170 | void AudioWidget::loadSkin() |
176 | { | 171 | { |
177 | loadDefaultSkin( ::skinInfo, ::buttonCount ); | 172 | loadDefaultSkin( guiInfo() ); |
178 | 173 | ||
179 | setBackgroundPixmap( backgroundPixmap ); | 174 | setBackgroundPixmap( backgroundPixmap ); |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 75d4857..53dbb88 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -57,6 +57,5 @@ public: | |||
57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } | 57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } |
58 | 58 | ||
59 | static const MediaWidget::SkinButtonInfo *skinInfo(); | 59 | static MediaWidget::GUIInfo guiInfo(); |
60 | static const uint buttonCount(); | ||
61 | 60 | ||
62 | public slots: | 61 | public slots: |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index ab2ec50..c0106d4 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -65,8 +65,8 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, | |||
65 | } | 65 | } |
66 | 66 | ||
67 | void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix ) | 67 | void MediaWidget::loadDefaultSkin( const GUIInfo &guiInfo ) |
68 | { | 68 | { |
69 | Skin skin( fileNameInfix ); | 69 | Skin skin( guiInfo.fileNameInfix ); |
70 | loadSkin( skinInfo, buttonCount, skin ); | 70 | loadSkin( guiInfo.buttonInfo, guiInfo.buttonCount, skin ); |
71 | } | 71 | } |
72 | 72 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 4599637..64483d8 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -81,4 +81,16 @@ public: | |||
81 | }; | 81 | }; |
82 | 82 | ||
83 | struct GUIInfo | ||
84 | { | ||
85 | GUIInfo() : buttonInfo( 0 ), buttonCount( 0 ) {} | ||
86 | GUIInfo( const QString &_fileNameInfix, const SkinButtonInfo *_buttonInfo, const uint _buttonCount ) | ||
87 | : fileNameInfix( _fileNameInfix ), buttonInfo( _buttonInfo ), buttonCount( _buttonCount ) | ||
88 | {} | ||
89 | |||
90 | QString fileNameInfix; | ||
91 | const SkinButtonInfo *buttonInfo; | ||
92 | const uint buttonCount; | ||
93 | }; | ||
94 | |||
83 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); | 95 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); |
84 | virtual ~MediaWidget(); | 96 | virtual ~MediaWidget(); |
@@ -106,5 +118,5 @@ protected: | |||
106 | Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin ); | 118 | Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin ); |
107 | 119 | ||
108 | void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null ); | 120 | void loadDefaultSkin( const GUIInfo &guiInfo ); |
109 | void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin ); | 121 | void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin ); |
110 | 122 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 058730f..2a345e3 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -100,12 +100,7 @@ VideoWidget::~VideoWidget() | |||
100 | } | 100 | } |
101 | 101 | ||
102 | const MediaWidget::SkinButtonInfo *VideoWidget::skinInfo() | 102 | MediaWidget::GUIInfo VideoWidget::guiInfo() |
103 | { | 103 | { |
104 | return ::skinInfo; | 104 | return GUIInfo( "V" /* infix */, ::skinInfo, ::buttonCount ); |
105 | } | ||
106 | |||
107 | const uint VideoWidget::buttonCount() | ||
108 | { | ||
109 | return ::buttonCount; | ||
110 | } | 105 | } |
111 | 106 | ||
@@ -168,5 +163,5 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) | |||
168 | void VideoWidget::loadSkin() | 163 | void VideoWidget::loadSkin() |
169 | { | 164 | { |
170 | loadDefaultSkin( ::skinInfo, ::buttonCount, "V" ); | 165 | loadDefaultSkin( guiInfo() ); |
171 | 166 | ||
172 | setBackgroundPixmap( backgroundPixmap ); | 167 | setBackgroundPixmap( backgroundPixmap ); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 80e9356..84bc964 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -51,6 +51,5 @@ public: | |||
51 | ~VideoWidget(); | 51 | ~VideoWidget(); |
52 | 52 | ||
53 | static const MediaWidget::SkinButtonInfo *skinInfo(); | 53 | static MediaWidget::GUIInfo guiInfo(); |
54 | static const uint buttonCount(); | ||
55 | 54 | ||
56 | XineVideoWidget* vidWidget(); | 55 | XineVideoWidget* vidWidget(); |