summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 19:52:45 (UTC)
committer simon <simon>2002-12-02 19:52:45 (UTC)
commit262f335a055e189130a3c0dd7028388ab103504e (patch) (side-by-side diff)
tree9115845fae96d06ca3235ae1b8153b9739cf3be5
parente77f4914311d8a623c084d01a287798440abf01f (diff)
downloadopie-262f335a055e189130a3c0dd7028388ab103504e.zip
opie-262f335a055e189130a3c0dd7028388ab103504e.tar.gz
opie-262f335a055e189130a3c0dd7028388ab103504e.tar.bz2
- less code duplication
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h6
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h8
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
@@ -156,15 +156,13 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name) :
// time.setFrame(FALSE);
// changeTextColor( &time );
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 ) ) );
connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) );
connect( this, SIGNAL( backClicked() ), this, SLOT( skipBack() ) );
connect( this, SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) );
connect( this, SIGNAL( backReleased() ), this, SLOT( stopSkip() ) );
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
@@ -73,19 +73,19 @@ public:
void setTickerText( const QString &text ) { songInfo.setText( text ); }
public slots:
void updateSlider( long, long );
void sliderPressed( );
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:
void moreClicked();
void lessClicked();
void moreReleased();
void lessReleased();
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
@@ -24,12 +24,16 @@ extern MediaPlayerState *mediaPlayerState;
MediaWidget::MediaWidget( QWidget *parent, const char *name )
: QWidget( parent, 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 ) ) );
}
MediaWidget::~MediaWidget()
{
}
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
@@ -30,11 +30,13 @@ class MediaWidget : public QWidget
public:
MediaWidget( QWidget *parent = 0, const char *name = 0 );
virtual ~MediaWidget();
public slots:
virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0;
+ virtual void setLength( long length ) = 0;
+ virtual void setPlaying( bool playing ) = 0;
};
#endif // MEDIAWIDGET_H
/* vim: et sw=4 ts=4
*/
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
@@ -135,15 +135,12 @@ MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) {
slider->setMaxValue( 1 );
slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
//slider->setFocusPolicy( QWidget::NoFocus );
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() );
setFullscreen( mediaPlayerState->isFullscreen() );
setPlaying( mediaPlayerState->isPlaying() );
}
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
@@ -62,19 +62,21 @@ public:
XineVideoWidget* vidWidget();
public slots:
void updateSlider( long, long );
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:
void moreClicked();
void lessClicked();
void moreReleased();
void lessReleased();