summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h4
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h2
4 files changed, 28 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 78079dd..4db444a 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -112,4 +112,14 @@ AudioWidget::~AudioWidget() {
112} 112}
113 113
114const MediaWidget::SkinButtonInfo *AudioWidget::skinInfo()
115{
116 return ::skinInfo;
117}
118
119const uint AudioWidget::buttonCount()
120{
121 return ::buttonCount;
122}
123
114void AudioWidget::resizeEvent( QResizeEvent *e ) { 124void AudioWidget::resizeEvent( QResizeEvent *e ) {
115 int h = height(); 125 int h = height();
@@ -165,5 +175,5 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
165void AudioWidget::loadSkin() 175void AudioWidget::loadSkin()
166{ 176{
167 loadDefaultSkin( skinInfo, buttonCount ); 177 loadDefaultSkin( ::skinInfo, ::buttonCount );
168 178
169 setBackgroundPixmap( backgroundPixmap ); 179 setBackgroundPixmap( backgroundPixmap );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 670fb45..75d4857 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -56,4 +56,8 @@ public:
56 ~AudioWidget(); 56 ~AudioWidget();
57 void setTickerText( const QString &text ) { songInfo.setText( text ); } 57 void setTickerText( const QString &text ) { songInfo.setText( text ); }
58
59 static const MediaWidget::SkinButtonInfo *skinInfo();
60 static const uint buttonCount();
61
58public slots: 62public slots:
59 void updateSlider( long, long ); 63 void updateSlider( long, long );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index a8ff540..058730f 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -100,4 +100,14 @@ VideoWidget::~VideoWidget()
100} 100}
101 101
102const MediaWidget::SkinButtonInfo *VideoWidget::skinInfo()
103{
104 return ::skinInfo;
105}
106
107const uint VideoWidget::buttonCount()
108{
109 return ::buttonCount;
110}
111
102void VideoWidget::resizeEvent( QResizeEvent *e ) { 112void VideoWidget::resizeEvent( QResizeEvent *e ) {
103 int h = height(); 113 int h = height();
@@ -158,5 +168,5 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
158void VideoWidget::loadSkin() 168void VideoWidget::loadSkin()
159{ 169{
160 loadDefaultSkin( skinInfo, buttonCount, "V" ); 170 loadDefaultSkin( ::skinInfo, ::buttonCount, "V" );
161 171
162 setBackgroundPixmap( backgroundPixmap ); 172 setBackgroundPixmap( backgroundPixmap );
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index f434945..80e9356 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -51,4 +51,6 @@ public:
51 ~VideoWidget(); 51 ~VideoWidget();
52 52
53 static const MediaWidget::SkinButtonInfo *skinInfo();
54 static const uint buttonCount();
53 55
54 XineVideoWidget* vidWidget(); 56 XineVideoWidget* vidWidget();