author | llornkcor <llornkcor> | 2002-03-18 01:50:17 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-18 01:50:17 (UTC) |
commit | c09cb25eb6bbf31bed0d4a415802469cfd1efedf (patch) (unidiff) | |
tree | 86ced0fa482bd5fb244629f2baa1b1a4f25c9189 /core/multimedia/opieplayer/videowidget.cpp | |
parent | 848182342d81b4e6ab4ce6b75bdaa0b109828af3 (diff) | |
download | opie-c09cb25eb6bbf31bed0d4a415802469cfd1efedf.zip opie-c09cb25eb6bbf31bed0d4a415802469cfd1efedf.tar.gz opie-c09cb25eb6bbf31bed0d4a415802469cfd1efedf.tar.bz2 |
added stuff and fixed stuff that I dont remember- plays w/o going to playlist among other things
Diffstat (limited to 'core/multimedia/opieplayer/videowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index be838c4..bb5f9e8 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp | |||
@@ -206,49 +206,49 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
206 | switch (i) { | 206 | switch (i) { |
207 | case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return; | 207 | case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return; |
208 | case VideoStop: mediaPlayerState->setPlaying(FALSE); return; | 208 | case VideoStop: mediaPlayerState->setPlaying(FALSE); return; |
209 | case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return; | 209 | case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return; |
210 | case VideoNext: mediaPlayerState->setNext(); return; | 210 | case VideoNext: mediaPlayerState->setNext(); return; |
211 | case VideoPrevious: mediaPlayerState->setPrev(); return; | 211 | case VideoPrevious: mediaPlayerState->setPrev(); return; |
212 | case VideoPlayList: mediaPlayerState->setList(); return; | 212 | case VideoPlayList: mediaPlayerState->setList(); return; |
213 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; | 213 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; |
214 | } | 214 | } |
215 | } | 215 | } |
216 | } | 216 | } |
217 | } | 217 | } |
218 | } | 218 | } |
219 | 219 | ||
220 | 220 | ||
221 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | 221 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { |
222 | mouseMoveEvent( event ); | 222 | mouseMoveEvent( event ); |
223 | } | 223 | } |
224 | 224 | ||
225 | 225 | ||
226 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 226 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
227 | if ( mediaPlayerState->fullscreen() ) { | 227 | if ( mediaPlayerState->fullscreen() ) { |
228 | mediaPlayerState->setFullscreen( FALSE ); | 228 | mediaPlayerState->setFullscreen( FALSE ); |
229 | makeVisible(); | 229 | makeVisible(); |
230 | } else { | 230 | |
231 | mouseMoveEvent( event ); | 231 | mouseMoveEvent( event ); |
232 | } | 232 | } |
233 | } | 233 | } |
234 | 234 | ||
235 | 235 | ||
236 | void VideoWidget::makeVisible() { | 236 | void VideoWidget::makeVisible() { |
237 | if ( mediaPlayerState->fullscreen() ) { | 237 | if ( mediaPlayerState->fullscreen() ) { |
238 | setBackgroundMode( QWidget::NoBackground ); | 238 | setBackgroundMode( QWidget::NoBackground ); |
239 | showFullScreen(); | 239 | showFullScreen(); |
240 | resize( qApp->desktop()->size() ); | 240 | resize( qApp->desktop()->size() ); |
241 | slider->hide(); | 241 | slider->hide(); |
242 | } else { | 242 | } else { |
243 | setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); | 243 | setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); |
244 | showNormal(); | 244 | showNormal(); |
245 | showMaximized(); | 245 | showMaximized(); |
246 | slider->show(); | 246 | slider->show(); |
247 | } | 247 | } |
248 | } | 248 | } |
249 | 249 | ||
250 | 250 | ||
251 | void VideoWidget::paintEvent( QPaintEvent * ) { | 251 | void VideoWidget::paintEvent( QPaintEvent * ) { |
252 | QPainter p( this ); | 252 | QPainter p( this ); |
253 | 253 | ||
254 | if ( mediaPlayerState->fullscreen() ) { | 254 | if ( mediaPlayerState->fullscreen() ) { |
@@ -400,24 +400,72 @@ bool VideoWidget::playVideo() { | |||
400 | 400 | ||
401 | result = mediaPlayerState->curDecoder()->videoReadScaledFrame( currentFrame->jumpTable(), 0, 0, sw, sh, w, h, format, 0) == 0; | 401 | result = mediaPlayerState->curDecoder()->videoReadScaledFrame( currentFrame->jumpTable(), 0, 0, sw, sh, w, h, format, 0) == 0; |
402 | 402 | ||
403 | QPainter p( this ); | 403 | QPainter p( this ); |
404 | 404 | ||
405 | // Image changed size, therefore need to blank the possibly unpainted regions first | 405 | // Image changed size, therefore need to blank the possibly unpainted regions first |
406 | if ( scaledWidth != w || scaledHeight != h ) { | 406 | if ( scaledWidth != w || scaledHeight != h ) { |
407 | p.setBrush( QBrush( Qt::black ) ); | 407 | p.setBrush( QBrush( Qt::black ) ); |
408 | p.drawRect( 9, 20, 220, 160 ); | 408 | p.drawRect( 9, 20, 220, 160 ); |
409 | } | 409 | } |
410 | 410 | ||
411 | scaledWidth = w; | 411 | scaledWidth = w; |
412 | scaledHeight = h; | 412 | scaledHeight = h; |
413 | 413 | ||
414 | if ( result ) { | 414 | if ( result ) { |
415 | p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight ); | 415 | p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight ); |
416 | } | 416 | } |
417 | 417 | ||
418 | } | 418 | } |
419 | 419 | ||
420 | return result; | 420 | return result; |
421 | } | 421 | } |
422 | 422 | ||
423 | 423 | ||
424 | |||
425 | void VideoWidget::keyReleaseEvent( QKeyEvent *e) | ||
426 | { | ||
427 | switch ( e->key() ) { | ||
428 | ////////////////////////////// Zaurus keys | ||
429 | case Key_Home: | ||
430 | break; | ||
431 | case Key_F9: //activity | ||
432 | break; | ||
433 | case Key_F10: //contacts | ||
434 | break; | ||
435 | case Key_F11: //menu | ||
436 | break; | ||
437 | case Key_F12: //home | ||
438 | break; | ||
439 | case Key_F13: //mail | ||
440 | break; | ||
441 | case Key_Space: { | ||
442 | if(mediaPlayerState->playing()) { | ||
443 | mediaPlayerState->setPlaying(FALSE); | ||
444 | } else { | ||
445 | mediaPlayerState->setPlaying(TRUE); | ||
446 | } | ||
447 | } | ||
448 | break; | ||
449 | case Key_Down: | ||
450 | // toggleButton(6); | ||
451 | // emit lessClicked(); | ||
452 | // emit lessReleased(); | ||
453 | // toggleButton(6); | ||
454 | break; | ||
455 | case Key_Up: | ||
456 | // toggleButton(5); | ||
457 | // emit moreClicked(); | ||
458 | // emit moreReleased(); | ||
459 | // toggleButton(5); | ||
460 | break; | ||
461 | case Key_Right: | ||
462 | mediaPlayerState->setNext(); | ||
463 | break; | ||
464 | case Key_Left: | ||
465 | mediaPlayerState->setPrev(); | ||
466 | break; | ||
467 | case Key_Escape: | ||
468 | break; | ||
469 | |||
470 | }; | ||
471 | } | ||