- expose information about the buttons

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
@@ -108,12 +108,22 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 
 AudioWidget::~AudioWidget() {
 
 //    mediaPlayerState->setPlaying(false);
 }
 
+const MediaWidget::SkinButtonInfo *AudioWidget::skinInfo()
+{
+    return ::skinInfo;
+}
+
+const uint AudioWidget::buttonCount()
+{
+    return ::buttonCount;
+}
+
 void AudioWidget::resizeEvent( QResizeEvent *e ) {
     int h = height();
     int w = width();
 
     songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) );
     slider.setFixedWidth( w - 110 );
@@ -161,13 +171,13 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
     killTimers();
     hide();
 }
 
 void AudioWidget::loadSkin()
 {
-    loadDefaultSkin( skinInfo, buttonCount );
+    loadDefaultSkin( ::skinInfo, ::buttonCount );
 
     setBackgroundPixmap( backgroundPixmap );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
 //    changeTextColor( &songInfo );
 //    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
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
@@ -52,12 +52,16 @@ class QPixmap;
 class AudioWidget : public MediaWidget {
     Q_OBJECT
 public:
     AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~AudioWidget();
     void setTickerText( const QString &text ) { songInfo.setText( text ); }
+
+    static const MediaWidget::SkinButtonInfo *skinInfo();
+    static const uint buttonCount();
+
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     void setLooping( bool b) { setToggleButton( Loop, b ); }
     void setPosition( 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
@@ -96,12 +96,22 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 
 
 VideoWidget::~VideoWidget() 
 {
 }
 
+const MediaWidget::SkinButtonInfo *VideoWidget::skinInfo()
+{
+    return ::skinInfo;
+}
+
+const uint VideoWidget::buttonCount()
+{
+    return ::buttonCount;
+}
+
 void VideoWidget::resizeEvent( QResizeEvent *e ) {
     int h = height();
     int w = width();
     //int Vh = 160;
     //int Vw = 220;
 
@@ -154,13 +164,13 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
     scaledHeight = 0;
     hide();
 }
 
 void VideoWidget::loadSkin()
 {
-    loadDefaultSkin( skinInfo, buttonCount, "V" );
+    loadDefaultSkin( ::skinInfo, ::buttonCount, "V" );
 
     setBackgroundPixmap( backgroundPixmap );
 
     delete slider;
     slider = new QSlider( Qt::Horizontal, this );
     slider->setMinValue( 0 );
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
@@ -47,12 +47,14 @@ class QSlider;
 class VideoWidget : public MediaWidget {
     Q_OBJECT
 public:
     VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~VideoWidget();
 
+    static const MediaWidget::SkinButtonInfo *skinInfo();
+    static const uint buttonCount();
 
     XineVideoWidget* vidWidget();
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );