-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 19 |
1 files changed, 4 insertions, 15 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 | |||
@@ -231,27 +231,12 @@ void VideoWidget::setPosition( long i ) { | |||
231 | void VideoWidget::setLength( long max ) { | 231 | void VideoWidget::setLength( long max ) { |
232 | updateSlider( mediaPlayerState->position(), max ); | 232 | updateSlider( mediaPlayerState->position(), max ); |
233 | } | 233 | } |
234 | 234 | ||
235 | void VideoWidget::setView( char view ) { | 235 | void 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 |
256 | scaledWidth = 0; | 241 | scaledWidth = 0; |
257 | scaledHeight = 0; | 242 | scaledHeight = 0; |
@@ -391,13 +376,17 @@ void VideoWidget::makeVisible() { | |||
391 | slider->hide(); | 376 | slider->hide(); |
392 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 377 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
393 | 378 | ||
394 | } else { | 379 | } else { |
395 | showMaximized(); | 380 | showMaximized(); |
396 | setBackgroundPixmap( *pixBg ); | 381 | setBackgroundPixmap( *pixBg ); |
382 | if ( mediaPlayerState->streaming() ) { | ||
383 | slider->hide(); | ||
384 | } else { | ||
397 | slider->show(); | 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 | } |
402 | 391 | ||
403 | 392 | ||