summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-11-10 16:43:22 (UTC)
committer harlekin <harlekin>2002-11-10 16:43:22 (UTC)
commit5a8660a4089fa2160da47e2a4d63baea431b48b1 (patch) (side-by-side diff)
tree4d4e7edb3c8fe6dc741fb19c6f5587093f7d4a57
parentcb4821802897bbf6e06be3b2608656e05db68b96 (diff)
downloadopie-5a8660a4089fa2160da47e2a4d63baea431b48b1.zip
opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.tar.gz
opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.tar.bz2
update
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp21
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
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
@@ -143,3 +143,2 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
- connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
@@ -383,4 +382,10 @@ void VideoWidget::makeVisible() {
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 {
@@ -399,10 +404,4 @@ void VideoWidget::makeVisible() {
}
- }
-}
-
-
-void VideoWidget::setSeekable( bool isSeekable ) {
- if ( !isSeekable || mediaPlayerState->fullscreen() ) {
- qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
+ if ( !mediaPlayerState->seekable() ) {
if( !slider->isHidden()) {
@@ -422,2 +421,5 @@ void VideoWidget::setSeekable( bool isSeekable ) {
}
+}
+
+
@@ -457,3 +459,2 @@ void VideoWidget::closeEvent( QCloseEvent* ) {
-
void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
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
@@ -71,3 +71,2 @@ public slots:
void setLength( long );
- void setSeekable( bool );
void setView( char );