author | harlekin <harlekin> | 2002-11-10 16:43:22 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-11-10 16:43:22 (UTC) |
commit | 5a8660a4089fa2160da47e2a4d63baea431b48b1 (patch) (side-by-side diff) | |
tree | 4d4e7edb3c8fe6dc741fb19c6f5587093f7d4a57 | |
parent | cb4821802897bbf6e06be3b2608656e05db68b96 (diff) | |
download | opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.zip opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.tar.gz opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.tar.bz2 |
update
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 21 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
2 files changed, 11 insertions, 11 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index a847605..c643273 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -142,5 +142,4 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); - connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); setLength( mediaPlayerState->length() ); @@ -382,6 +381,12 @@ void VideoWidget::makeVisible() { showFullScreen(); resize( qApp->desktop()->size() ); - slider->hide(); videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); + + 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() ) ); + disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); + } else { showNormal(); @@ -398,12 +403,6 @@ void VideoWidget::makeVisible() { videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); } - } -} - - -void VideoWidget::setSeekable( bool isSeekable ) { - if ( !isSeekable || mediaPlayerState->fullscreen() ) { - qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); + if ( !mediaPlayerState->seekable() ) { if( !slider->isHidden()) { slider->hide(); @@ -421,4 +420,7 @@ void VideoWidget::setSeekable( bool isSeekable ) { } } +} + + @@ -456,5 +458,4 @@ void VideoWidget::closeEvent( QCloseEvent* ) { - void VideoWidget::keyReleaseEvent( QKeyEvent *e) { switch ( e->key() ) { diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index fd02805..990fa5f 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h @@ -70,5 +70,4 @@ public slots: void setPosition( long ); void setLength( long ); - void setSeekable( bool ); void setView( char ); |