summaryrefslogtreecommitdiff
Side-by-side diff
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() {
}
+const MediaWidget::SkinButtonInfo *AudioWidget::skinInfo()
+{
+ return ::skinInfo;
+}
+
+const uint AudioWidget::buttonCount()
+{
+ return ::buttonCount;
+}
+
void AudioWidget::resizeEvent( QResizeEvent *e ) {
int h = height();
@@ -165,5 +175,5 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
void AudioWidget::loadSkin()
{
- loadDefaultSkin( skinInfo, buttonCount );
+ loadDefaultSkin( ::skinInfo, ::buttonCount );
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:
~AudioWidget();
void setTickerText( const QString &text ) { songInfo.setText( text ); }
+
+ static const MediaWidget::SkinButtonInfo *skinInfo();
+ static const uint buttonCount();
+
public slots:
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()
}
+const MediaWidget::SkinButtonInfo *VideoWidget::skinInfo()
+{
+ return ::skinInfo;
+}
+
+const uint VideoWidget::buttonCount()
+{
+ return ::buttonCount;
+}
+
void VideoWidget::resizeEvent( QResizeEvent *e ) {
int h = height();
@@ -158,5 +168,5 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
void VideoWidget::loadSkin()
{
- loadDefaultSkin( skinInfo, buttonCount, "V" );
+ loadDefaultSkin( ::skinInfo, ::buttonCount, "V" );
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:
~VideoWidget();
+ static const MediaWidget::SkinButtonInfo *skinInfo();
+ static const uint buttonCount();
XineVideoWidget* vidWidget();