author | simon <simon> | 2002-12-02 19:52:45 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 19:52:45 (UTC) |
commit | 262f335a055e189130a3c0dd7028388ab103504e (patch) (side-by-side diff) | |
tree | 9115845fae96d06ca3235ae1b8153b9739cf3be5 /noncore | |
parent | e77f4914311d8a623c084d01a287798440abf01f (diff) | |
download | opie-262f335a055e189130a3c0dd7028388ab103504e.zip opie-262f335a055e189130a3c0dd7028388ab103504e.tar.gz opie-262f335a055e189130a3c0dd7028388ab103504e.tar.bz2 |
- less code duplication
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 8 |
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 @@ -161,5 +161,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name) : - 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 @@ -78,5 +78,3 @@ public slots: void setLooping( bool b) { setToggleButton( AudioLoop, b ); } - void setPlaying( bool b) { setToggleButton( AudioPlay, b ); } void setPosition( long ); - void setLength( long ); void setSeekable( bool ); @@ -84,3 +82,5 @@ public slots: public: - void setDisplayType( MediaPlayerState::DisplayType displayType ); + virtual void setLength( long ); + virtual void setPlaying( bool b) { setToggleButton( AudioPlay, b ); } + virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); 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 @@ -29,2 +29,6 @@ MediaWidget::MediaWidget( QWidget *parent, const char *name ) 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 @@ -35,2 +35,4 @@ 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 @@ -140,5 +140,2 @@ MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) { - connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); - connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); - setLength( mediaPlayerState->length() ); 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 @@ -67,3 +67,2 @@ public slots: void sliderReleased( ); - void setPlaying( bool b); void setFullscreen( bool b ); @@ -72,4 +71,7 @@ public slots: 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 ); |