author | simon <simon> | 2002-12-02 19:52:45 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 19:52:45 (UTC) |
commit | 262f335a055e189130a3c0dd7028388ab103504e (patch) (unidiff) | |
tree | 9115845fae96d06ca3235ae1b8153b9739cf3be5 /noncore/multimedia/opieplayer2 | |
parent | e77f4914311d8a623c084d01a287798440abf01f (diff) | |
download | opie-262f335a055e189130a3c0dd7028388ab103504e.zip opie-262f335a055e189130a3c0dd7028388ab103504e.tar.gz opie-262f335a055e189130a3c0dd7028388ab103504e.tar.bz2 |
- less code duplication
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -159,9 +159,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name) : | |||
159 | 159 | ||
160 | resizeEvent( NULL ); | 160 | resizeEvent( NULL ); |
161 | 161 | ||
162 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); | ||
163 | connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); | 162 | connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); |
164 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); | ||
165 | connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); | 163 | connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); |
166 | 164 | ||
167 | connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); | 165 | connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); |
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 | |||
@@ -76,13 +76,13 @@ public slots: | |||
76 | void sliderPressed( ); | 76 | void sliderPressed( ); |
77 | void sliderReleased( ); | 77 | void sliderReleased( ); |
78 | void setLooping( bool b) { setToggleButton( AudioLoop, b ); } | 78 | void setLooping( bool b) { setToggleButton( AudioLoop, b ); } |
79 | void setPlaying( bool b) { setToggleButton( AudioPlay, b ); } | ||
80 | void setPosition( long ); | 79 | void setPosition( long ); |
81 | void setLength( long ); | ||
82 | void setSeekable( bool ); | 80 | void setSeekable( bool ); |
83 | 81 | ||
84 | public: | 82 | public: |
85 | void setDisplayType( MediaPlayerState::DisplayType displayType ); | 83 | virtual void setLength( long ); |
84 | virtual void setPlaying( bool b) { setToggleButton( AudioPlay, b ); } | ||
85 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | ||
86 | 86 | ||
87 | signals: | 87 | signals: |
88 | void moreClicked(); | 88 | void moreClicked(); |
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 | |||
@@ -27,6 +27,10 @@ MediaWidget::MediaWidget( QWidget *parent, const char *name ) | |||
27 | { | 27 | { |
28 | connect( mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), | 28 | connect( mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), |
29 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); | 29 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); |
30 | connect( mediaPlayerState, SIGNAL( lengthChanged( long ) ), | ||
31 | this, SLOT( setLength( long ) ) ); | ||
32 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), | ||
33 | this, SLOT( setPlaying( bool ) ) ); | ||
30 | } | 34 | } |
31 | 35 | ||
32 | MediaWidget::~MediaWidget() | 36 | 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 | |||
@@ -33,6 +33,8 @@ public: | |||
33 | 33 | ||
34 | public slots: | 34 | public slots: |
35 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; | 35 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; |
36 | virtual void setLength( long length ) = 0; | ||
37 | virtual void setPlaying( bool playing ) = 0; | ||
36 | }; | 38 | }; |
37 | 39 | ||
38 | #endif // MEDIAWIDGET_H | 40 | #endif // MEDIAWIDGET_H |
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 | |||
@@ -138,9 +138,6 @@ MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
138 | 138 | ||
139 | resizeEvent( NULL ); | 139 | resizeEvent( NULL ); |
140 | 140 | ||
141 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); | ||
142 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); | ||
143 | |||
144 | setLength( mediaPlayerState->length() ); | 141 | setLength( mediaPlayerState->length() ); |
145 | setPosition( mediaPlayerState->position() ); | 142 | setPosition( mediaPlayerState->position() ); |
146 | setFullscreen( mediaPlayerState->isFullscreen() ); | 143 | setFullscreen( mediaPlayerState->isFullscreen() ); |
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 | |||
@@ -65,13 +65,15 @@ public slots: | |||
65 | void updateSlider( long, long ); | 65 | void updateSlider( long, long ); |
66 | void sliderPressed( ); | 66 | void sliderPressed( ); |
67 | void sliderReleased( ); | 67 | void sliderReleased( ); |
68 | void setPlaying( bool b); | ||
69 | void setFullscreen( bool b ); | 68 | void setFullscreen( bool b ); |
70 | void makeVisible(); | 69 | void makeVisible(); |
71 | void backToNormal(); | 70 | void backToNormal(); |
72 | void setPosition( long ); | 71 | void setPosition( long ); |
73 | void setLength( long ); | 72 | |
74 | void setDisplayType( MediaPlayerState::DisplayType displayType ); | 73 | public: |
74 | virtual void setPlaying( bool b); | ||
75 | virtual void setLength( long ); | ||
76 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | ||
75 | 77 | ||
76 | signals: | 78 | signals: |
77 | void moreClicked(); | 79 | void moreClicked(); |