Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 3a757f0..c435241 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -144,8 +144,8 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
144 | 144 | ||
145 | setLength( mediaPlayerState->length() ); | 145 | setLength( mediaPlayerState->length() ); |
146 | setPosition( mediaPlayerState->position() ); | 146 | setPosition( mediaPlayerState->position() ); |
147 | setFullscreen( mediaPlayerState->fullscreen() ); | 147 | setFullscreen( mediaPlayerState->isFullscreen() ); |
148 | setPlaying( mediaPlayerState->playing() ); | 148 | setPlaying( mediaPlayerState->isPlaying() ); |
149 | } | 149 | } |
150 | 150 | ||
151 | 151 | ||
@@ -258,7 +258,7 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
258 | } | 258 | } |
259 | int width = slider->width(); | 259 | int width = slider->width(); |
260 | int val = int((double)i * width / max); | 260 | int val = int((double)i * width / max); |
261 | if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) { | 261 | if ( !mediaPlayerState->isFullscreen() && !videoSliderBeingMoved ) { |
262 | if ( slider->value() != val ) { | 262 | if ( slider->value() != val ) { |
263 | slider->setValue( val ); | 263 | slider->setValue( val ); |
264 | } | 264 | } |
@@ -327,11 +327,11 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
327 | switch(i) { | 327 | switch(i) { |
328 | 328 | ||
329 | case VideoPlay: { | 329 | case VideoPlay: { |
330 | if( mediaPlayerState->paused() ) { | 330 | if( mediaPlayerState->isPaused() ) { |
331 | setToggleButton( i, FALSE ); | 331 | setToggleButton( i, FALSE ); |
332 | mediaPlayerState->setPaused( FALSE ); | 332 | mediaPlayerState->setPaused( FALSE ); |
333 | return; | 333 | return; |
334 | } else if( !mediaPlayerState->paused() ) { | 334 | } else if( !mediaPlayerState->isPaused() ) { |
335 | setToggleButton( i, TRUE ); | 335 | setToggleButton( i, TRUE ); |
336 | mediaPlayerState->setPaused( TRUE ); | 336 | mediaPlayerState->setPaused( TRUE ); |
337 | return; | 337 | return; |
@@ -357,7 +357,7 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) { | |||
357 | } | 357 | } |
358 | 358 | ||
359 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 359 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
360 | if ( mediaPlayerState->fullscreen() ) { | 360 | if ( mediaPlayerState->isFullscreen() ) { |
361 | mediaPlayerState->setFullscreen( FALSE ); | 361 | mediaPlayerState->setFullscreen( FALSE ); |
362 | makeVisible(); | 362 | makeVisible(); |
363 | } | 363 | } |
@@ -376,7 +376,7 @@ void VideoWidget::showEvent( QShowEvent* ) { | |||
376 | } | 376 | } |
377 | 377 | ||
378 | void VideoWidget::makeVisible() { | 378 | void VideoWidget::makeVisible() { |
379 | if ( mediaPlayerState->fullscreen() ) { | 379 | if ( mediaPlayerState->isFullscreen() ) { |
380 | setBackgroundMode( QWidget::NoBackground ); | 380 | setBackgroundMode( QWidget::NoBackground ); |
381 | showFullScreen(); | 381 | showFullScreen(); |
382 | resize( qApp->desktop()->size() ); | 382 | resize( qApp->desktop()->size() ); |
@@ -403,7 +403,7 @@ void VideoWidget::makeVisible() { | |||
403 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); | 403 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); |
404 | } | 404 | } |
405 | 405 | ||
406 | if ( !mediaPlayerState->seekable() ) { | 406 | if ( !mediaPlayerState->isSeekable() ) { |
407 | if( !slider->isHidden()) { | 407 | if( !slider->isHidden()) { |
408 | slider->hide(); | 408 | slider->hide(); |
409 | } | 409 | } |
@@ -427,7 +427,7 @@ void VideoWidget::makeVisible() { | |||
427 | void VideoWidget::paintEvent( QPaintEvent * pe) { | 427 | void VideoWidget::paintEvent( QPaintEvent * pe) { |
428 | QPainter p( this ); | 428 | QPainter p( this ); |
429 | 429 | ||
430 | if ( mediaPlayerState->fullscreen() ) { | 430 | if ( mediaPlayerState->isFullscreen() ) { |
431 | // Clear the background | 431 | // Clear the background |
432 | p.setBrush( QBrush( Qt::black ) ); | 432 | p.setBrush( QBrush( Qt::black ) ); |
433 | } else { | 433 | } else { |
@@ -474,7 +474,7 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | |||
474 | case Key_F13: //mail | 474 | case Key_F13: //mail |
475 | break; | 475 | break; |
476 | case Key_Space: { | 476 | case Key_Space: { |
477 | if(mediaPlayerState->playing()) { | 477 | if(mediaPlayerState->isPlaying()) { |
478 | mediaPlayerState->setPlaying(FALSE); | 478 | mediaPlayerState->setPlaying(FALSE); |
479 | } else { | 479 | } else { |
480 | mediaPlayerState->setPlaying(TRUE); | 480 | mediaPlayerState->setPlaying(TRUE); |