- less code duplication

6 files changed, 14 insertions, 11 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 0b7d470..f4edb79 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -160,7 +160,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name) :
     resizeEvent( NULL );
 
-    connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
     connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
-    connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
     connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
 
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 74c5b0e..83927f1 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -77,11 +77,11 @@ public slots:
     void sliderReleased( );
     void setLooping( bool b) { setToggleButton( AudioLoop, b ); }
-    void setPlaying( bool b) { setToggleButton( AudioPlay, b ); }
     void setPosition( long );
-    void setLength( long );
     void setSeekable( bool );
 
 public:
-    void setDisplayType( MediaPlayerState::DisplayType displayType );
+    virtual void setLength( long );
+    virtual void setPlaying( bool b) { setToggleButton( AudioPlay, b ); }
+    virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 9d1d7fc..83456a0 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -28,4 +28,8 @@ MediaWidget::MediaWidget( QWidget *parent, const char *name )
     connect( mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
              this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
+    connect( mediaPlayerState, SIGNAL( lengthChanged( long ) ),
+             this, SLOT( setLength( long ) ) );
+    connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),
+             this, SLOT( setPlaying( bool ) ) );
 }
 
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index cbd08e2..fc5198e 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -34,4 +34,6 @@ public:
 public slots:
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0;
+    virtual void setLength( long length ) = 0;
+    virtual void setPlaying( bool playing ) = 0;
 };
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 8a0016e..888fcf4 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -139,7 +139,4 @@ MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) {
     resizeEvent( NULL );
 
-    connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
-    connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
-
     setLength( mediaPlayerState->length() );
     setPosition( mediaPlayerState->position() );
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 8e9dd7e..816ce2e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -66,11 +66,13 @@ public slots:
     void sliderPressed( );
     void sliderReleased( );
-    void setPlaying( bool b);
     void setFullscreen( bool b );
     void makeVisible();
     void backToNormal();
     void setPosition( long );
-    void setLength( long );
-    void setDisplayType( MediaPlayerState::DisplayType displayType );
+
+public:
+    virtual void setPlaying( bool b);
+    virtual void setLength( long );
+    virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals: