summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp23
1 files changed, 6 insertions, 17 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 5a69bf5..956789f 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -233,23 +233,8 @@ void VideoWidget::setLength( long max ) {
233} 233}
234 234
235void VideoWidget::setView( char view ) { 235void VideoWidget::setView( char view ) {
236 236
237 if ( mediaPlayerState->streaming() ) {
238 qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
239 if( !slider->isHidden()) {
240 slider->hide();
241 }
242 disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
243 disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
244 } else {
245 // this stops the slider from being moved, thus
246 // does not stop stream when it reaches the end
247 slider->show();
248 connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
249 connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
250 }
251
252 if ( view == 'v' ) { 237 if ( view == 'v' ) {
253 makeVisible(); 238 makeVisible();
254 } else { 239 } else {
255 // Effectively blank the view next time we show it so it looks nicer 240 // Effectively blank the view next time we show it so it looks nicer
@@ -393,9 +378,13 @@ void VideoWidget::makeVisible() {
393 378
394 } else { 379 } else {
395 showMaximized(); 380 showMaximized();
396 setBackgroundPixmap( *pixBg ); 381 setBackgroundPixmap( *pixBg );
397 slider->show(); 382 if ( mediaPlayerState->streaming() ) {
383 slider->hide();
384 } else {
385 slider->show();
386 }
398 videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); 387 videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) );
399 qApp->processEvents(); 388 qApp->processEvents();
400 } 389 }
401} 390}
@@ -484,9 +473,9 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
484 mediaPlayerState->setPaused( FALSE ); 473 mediaPlayerState->setPaused( FALSE );
485 } else if( !mediaPlayerState->isPaused ) { 474 } else if( !mediaPlayerState->isPaused ) {
486 setToggleButton( i, TRUE ); 475 setToggleButton( i, TRUE );
487 mediaPlayerState->setPaused( TRUE ); 476 mediaPlayerState->setPaused( TRUE );
488 } 477 }
489#endif 478#endif
490 break; 479 break;
491 480
492 }; 481 };