author | harlekin <harlekin> | 2002-11-10 16:43:22 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-11-10 16:43:22 (UTC) |
commit | 5a8660a4089fa2160da47e2a4d63baea431b48b1 (patch) (unidiff) | |
tree | 4d4e7edb3c8fe6dc741fb19c6f5587093f7d4a57 /noncore/multimedia/opieplayer2/videowidget.cpp | |
parent | cb4821802897bbf6e06be3b2608656e05db68b96 (diff) | |
download | opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.zip opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.tar.gz opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.tar.bz2 |
update
Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 49 |
1 files changed, 25 insertions, 24 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 | |||
@@ -141,7 +141,6 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
141 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); | 141 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); |
142 | connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); | 142 | connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); |
143 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); | 143 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); |
144 | connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); | ||
145 | 144 | ||
146 | setLength( mediaPlayerState->length() ); | 145 | setLength( mediaPlayerState->length() ); |
147 | setPosition( mediaPlayerState->position() ); | 146 | setPosition( mediaPlayerState->position() ); |
@@ -381,8 +380,14 @@ void VideoWidget::makeVisible() { | |||
381 | setBackgroundMode( QWidget::NoBackground ); | 380 | setBackgroundMode( QWidget::NoBackground ); |
382 | showFullScreen(); | 381 | showFullScreen(); |
383 | resize( qApp->desktop()->size() ); | 382 | resize( qApp->desktop()->size() ); |
384 | slider->hide(); | ||
385 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 383 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
384 | |||
385 | slider->hide(); | ||
386 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | ||
387 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | ||
388 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | ||
389 | disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | ||
390 | |||
386 | } else { | 391 | } else { |
387 | showNormal(); | 392 | showNormal(); |
388 | showMaximized(); | 393 | showMaximized(); |
@@ -397,31 +402,28 @@ void VideoWidget::makeVisible() { | |||
397 | } else { | 402 | } else { |
398 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); | 403 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); |
399 | } | 404 | } |
400 | } | ||
401 | } | ||
402 | |||
403 | 405 | ||
404 | void VideoWidget::setSeekable( bool isSeekable ) { | 406 | if ( !mediaPlayerState->seekable() ) { |
405 | 407 | if( !slider->isHidden()) { | |
406 | if ( !isSeekable || mediaPlayerState->fullscreen() ) { | 408 | slider->hide(); |
407 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); | 409 | } |
408 | if( !slider->isHidden()) { | 410 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
409 | slider->hide(); | 411 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
412 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | ||
413 | disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | ||
414 | } else { | ||
415 | slider->show(); | ||
416 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | ||
417 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | ||
418 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | ||
419 | connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | ||
410 | } | 420 | } |
411 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | ||
412 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | ||
413 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | ||
414 | disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | ||
415 | } else { | ||
416 | slider->show(); | ||
417 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | ||
418 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | ||
419 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | ||
420 | connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | ||
421 | } | 421 | } |
422 | } | 422 | } |
423 | 423 | ||
424 | 424 | ||
425 | |||
426 | |||
425 | void VideoWidget::paintEvent( QPaintEvent * pe) { | 427 | void VideoWidget::paintEvent( QPaintEvent * pe) { |
426 | QPainter p( this ); | 428 | QPainter p( this ); |
427 | 429 | ||
@@ -455,7 +457,6 @@ void VideoWidget::closeEvent( QCloseEvent* ) { | |||
455 | } | 457 | } |
456 | 458 | ||
457 | 459 | ||
458 | |||
459 | void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | 460 | void VideoWidget::keyReleaseEvent( QKeyEvent *e) { |
460 | switch ( e->key() ) { | 461 | switch ( e->key() ) { |
461 | ////////////////////////////// Zaurus keys | 462 | ////////////////////////////// Zaurus keys |
@@ -510,11 +511,11 @@ XineVideoWidget* VideoWidget::vidWidget() { | |||
510 | 511 | ||
511 | 512 | ||
512 | void VideoWidget::setFullscreen ( bool b ) { | 513 | void VideoWidget::setFullscreen ( bool b ) { |
513 | setToggleButton( VideoFullscreen, b ); | 514 | setToggleButton( VideoFullscreen, b ); |
514 | } | 515 | } |
515 | 516 | ||
516 | 517 | ||
517 | void VideoWidget::setPlaying( bool b) { | 518 | void VideoWidget::setPlaying( bool b) { |
518 | setToggleButton( VideoPlay, b ); | 519 | setToggleButton( VideoPlay, b ); |
519 | } | 520 | } |
520 | 521 | ||