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 @@ -141,14 +141,14 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); setLength( mediaPlayerState->length() ); setPosition( mediaPlayerState->position() ); - setFullscreen( mediaPlayerState->fullscreen() ); - setPlaying( mediaPlayerState->playing() ); + setFullscreen( mediaPlayerState->isFullscreen() ); + setPlaying( mediaPlayerState->isPlaying() ); } VideoWidget::~VideoWidget() { for ( int i = 0; i < 7; i++ ) { @@ -255,13 +255,13 @@ void VideoWidget::updateSlider( long i, long max ) { // Will flicker too much if we don't do this if ( max == 0 ) { return; } int width = slider->width(); int val = int((double)i * width / max); - if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) { + if ( !mediaPlayerState->isFullscreen() && !videoSliderBeingMoved ) { if ( slider->value() != val ) { slider->setValue( val ); } if ( slider->maxValue() != width ) { slider->setMaxValue( width ); } @@ -324,17 +324,17 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { setToggleButton( i, FALSE ); } switch(i) { case VideoPlay: { - if( mediaPlayerState->paused() ) { + if( mediaPlayerState->isPaused() ) { setToggleButton( i, FALSE ); mediaPlayerState->setPaused( FALSE ); return; - } else if( !mediaPlayerState->paused() ) { + } else if( !mediaPlayerState->isPaused() ) { setToggleButton( i, TRUE ); mediaPlayerState->setPaused( TRUE ); return; } else { return; } @@ -354,13 +354,13 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { void VideoWidget::mousePressEvent( QMouseEvent *event ) { mouseMoveEvent( event ); } void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { - if ( mediaPlayerState->fullscreen() ) { + if ( mediaPlayerState->isFullscreen() ) { mediaPlayerState->setFullscreen( FALSE ); makeVisible(); } mouseMoveEvent( event ); } @@ -373,13 +373,13 @@ void VideoWidget::showEvent( QShowEvent* ) { void VideoWidget::backToNormal() { mediaPlayerState->setFullscreen( FALSE ); makeVisible(); } void VideoWidget::makeVisible() { - if ( mediaPlayerState->fullscreen() ) { + if ( mediaPlayerState->isFullscreen() ) { setBackgroundMode( QWidget::NoBackground ); showFullScreen(); resize( qApp->desktop()->size() ); videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); slider->hide(); @@ -400,13 +400,13 @@ void VideoWidget::makeVisible() { int newW=(w/2)-(246/2); //this will only work with 320x240 videoFrame->setGeometry( QRect( newW, 4, 240, 170 ) ); } else { videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); } - if ( !mediaPlayerState->seekable() ) { + if ( !mediaPlayerState->isSeekable() ) { if( !slider->isHidden()) { slider->hide(); } disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); @@ -424,13 +424,13 @@ void VideoWidget::makeVisible() { void VideoWidget::paintEvent( QPaintEvent * pe) { QPainter p( this ); - if ( mediaPlayerState->fullscreen() ) { + if ( mediaPlayerState->isFullscreen() ) { // Clear the background p.setBrush( QBrush( Qt::black ) ); } else { if ( !pe->erased() ) { // Combine with background and double buffer QPixmap pix( pe->rect().size() ); @@ -471,13 +471,13 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { break; case Key_F12: //home break; case Key_F13: //mail break; case Key_Space: { - if(mediaPlayerState->playing()) { + if(mediaPlayerState->isPlaying()) { mediaPlayerState->setPlaying(FALSE); } else { mediaPlayerState->setPlaying(TRUE); } } break; |