author | simon <simon> | 2002-12-09 15:39:26 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 15:39:26 (UTC) |
commit | 21738c78103c42605625f85abf7bfd0d6beaad3f (patch) (unidiff) | |
tree | 0d64cf6453265f4730025d4965b4fff6d1613115 /noncore/multimedia/opieplayer2/videowidget.cpp | |
parent | 9aa2442f6ea4e0d58fa7888995ebad04b3692049 (diff) | |
download | opie-21738c78103c42605625f85abf7bfd0d6beaad3f.zip opie-21738c78103c42605625f85abf7bfd0d6beaad3f.tar.gz opie-21738c78103c42605625f85abf7bfd0d6beaad3f.tar.bz2 |
- merged duplicated setToggleButton method
- minor fixlet for paintAllButtons
Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 8f6a8a9..db4a396 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -197,102 +197,96 @@ void VideoWidget::sliderPressed() { | |||
197 | void VideoWidget::sliderReleased() { | 197 | void VideoWidget::sliderReleased() { |
198 | videoSliderBeingMoved = FALSE; | 198 | videoSliderBeingMoved = FALSE; |
199 | if ( slider->width() == 0 ) { | 199 | if ( slider->width() == 0 ) { |
200 | return; | 200 | return; |
201 | } | 201 | } |
202 | long val = long((double)slider->value() * mediaPlayerState.length() / slider->width()); | 202 | long val = long((double)slider->value() * mediaPlayerState.length() / slider->width()); |
203 | mediaPlayerState.setPosition( val ); | 203 | mediaPlayerState.setPosition( val ); |
204 | } | 204 | } |
205 | 205 | ||
206 | void VideoWidget::setPosition( long i ) { | 206 | void VideoWidget::setPosition( long i ) { |
207 | updateSlider( i, mediaPlayerState.length() ); | 207 | updateSlider( i, mediaPlayerState.length() ); |
208 | } | 208 | } |
209 | 209 | ||
210 | 210 | ||
211 | void VideoWidget::setLength( long max ) { | 211 | void VideoWidget::setLength( long max ) { |
212 | updateSlider( mediaPlayerState.position(), max ); | 212 | updateSlider( mediaPlayerState.position(), max ); |
213 | } | 213 | } |
214 | 214 | ||
215 | void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) | 215 | void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) |
216 | { | 216 | { |
217 | if ( displayType == MediaPlayerState::Video ) { | 217 | if ( displayType == MediaPlayerState::Video ) { |
218 | makeVisible(); | 218 | makeVisible(); |
219 | return; | 219 | return; |
220 | } | 220 | } |
221 | 221 | ||
222 | // Effectively blank the view next time we show it so it looks nicer | 222 | // Effectively blank the view next time we show it so it looks nicer |
223 | scaledWidth = 0; | 223 | scaledWidth = 0; |
224 | scaledHeight = 0; | 224 | scaledHeight = 0; |
225 | hide(); | 225 | hide(); |
226 | } | 226 | } |
227 | 227 | ||
228 | void VideoWidget::updateSlider( long i, long max ) { | 228 | void VideoWidget::updateSlider( long i, long max ) { |
229 | // Will flicker too much if we don't do this | 229 | // Will flicker too much if we don't do this |
230 | if ( max == 0 ) { | 230 | if ( max == 0 ) { |
231 | return; | 231 | return; |
232 | } | 232 | } |
233 | int width = slider->width(); | 233 | int width = slider->width(); |
234 | int val = int((double)i * width / max); | 234 | int val = int((double)i * width / max); |
235 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { | 235 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { |
236 | if ( slider->value() != val ) { | 236 | if ( slider->value() != val ) { |
237 | slider->setValue( val ); | 237 | slider->setValue( val ); |
238 | } | 238 | } |
239 | if ( slider->maxValue() != width ) { | 239 | if ( slider->maxValue() != width ) { |
240 | slider->setMaxValue( width ); | 240 | slider->setMaxValue( width ); |
241 | } | 241 | } |
242 | } | 242 | } |
243 | } | 243 | } |
244 | 244 | ||
245 | void VideoWidget::setToggleButton( int i, bool down ) { | ||
246 | if ( down != buttons[i].isDown ) { | ||
247 | toggleButton( i ); | ||
248 | } | ||
249 | } | ||
250 | |||
251 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | 245 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { |
252 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { | 246 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { |
253 | if ( event->state() == QMouseEvent::LeftButton ) { | 247 | if ( event->state() == QMouseEvent::LeftButton ) { |
254 | // The test to see if the mouse click is inside the button or not | 248 | // The test to see if the mouse click is inside the button or not |
255 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 249 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
256 | 250 | ||
257 | if ( isOnButton && !buttons[i].isHeld ) { | 251 | if ( isOnButton && !buttons[i].isHeld ) { |
258 | buttons[i].isHeld = TRUE; | 252 | buttons[i].isHeld = TRUE; |
259 | toggleButton(i); | 253 | toggleButton(i); |
260 | 254 | ||
261 | switch (i) { | 255 | switch (i) { |
262 | case VideoVolUp: | 256 | case VideoVolUp: |
263 | emit moreClicked(); | 257 | emit moreClicked(); |
264 | return; | 258 | return; |
265 | case VideoVolDown: | 259 | case VideoVolDown: |
266 | emit lessClicked(); | 260 | emit lessClicked(); |
267 | return; | 261 | return; |
268 | } | 262 | } |
269 | } else if ( !isOnButton && buttons[i].isHeld ) { | 263 | } else if ( !isOnButton && buttons[i].isHeld ) { |
270 | buttons[i].isHeld = FALSE; | 264 | buttons[i].isHeld = FALSE; |
271 | toggleButton(i); | 265 | toggleButton(i); |
272 | } | 266 | } |
273 | } else { | 267 | } else { |
274 | 268 | ||
275 | if ( buttons[i].isHeld ) { | 269 | if ( buttons[i].isHeld ) { |
276 | buttons[i].isHeld = FALSE; | 270 | buttons[i].isHeld = FALSE; |
277 | if ( buttons[i].type != ToggleButton ) { | 271 | if ( buttons[i].type != ToggleButton ) { |
278 | setToggleButton( i, FALSE ); | 272 | setToggleButton( i, FALSE ); |
279 | } | 273 | } |
280 | 274 | ||
281 | switch(i) { | 275 | switch(i) { |
282 | 276 | ||
283 | case VideoPlay: { | 277 | case VideoPlay: { |
284 | if( mediaPlayerState.isPaused() ) { | 278 | if( mediaPlayerState.isPaused() ) { |
285 | setToggleButton( i, FALSE ); | 279 | setToggleButton( i, FALSE ); |
286 | mediaPlayerState.setPaused( FALSE ); | 280 | mediaPlayerState.setPaused( FALSE ); |
287 | return; | 281 | return; |
288 | } else if( !mediaPlayerState.isPaused() ) { | 282 | } else if( !mediaPlayerState.isPaused() ) { |
289 | setToggleButton( i, TRUE ); | 283 | setToggleButton( i, TRUE ); |
290 | mediaPlayerState.setPaused( TRUE ); | 284 | mediaPlayerState.setPaused( TRUE ); |
291 | return; | 285 | return; |
292 | } else { | 286 | } else { |
293 | return; | 287 | return; |
294 | } | 288 | } |
295 | } | 289 | } |
296 | 290 | ||
297 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; | 291 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; |
298 | case VideoNext: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | 292 | case VideoNext: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; |