author | harlekin <harlekin> | 2002-08-09 21:06:15 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-09 21:06:15 (UTC) |
commit | 62f9bc4e906784d201d758b9c0bba05a294a31be (patch) (unidiff) | |
tree | dfdb5b202046fdd87879fa0f8ccf75eec7369363 | |
parent | 46eb53b1fd042d2591933a7d89a0e65b79140f16 (diff) | |
download | opie-62f9bc4e906784d201d758b9c0bba05a294a31be.zip opie-62f9bc4e906784d201d758b9c0bba05a294a31be.tar.gz opie-62f9bc4e906784d201d758b9c0bba05a294a31be.tar.bz2 |
fix runnaway seek on media change
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 6b656ee..dc90a62 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -303,3 +303,2 @@ void AudioWidget::setLength( long max ) { | |||
303 | void AudioWidget::setView( char view ) { | 303 | void AudioWidget::setView( char view ) { |
304 | slider.show(); | ||
305 | 304 | ||
@@ -307,17 +306,19 @@ void AudioWidget::setView( char view ) { | |||
307 | 306 | ||
308 | // if ( mediaPlayerState->streaming() ) { | 307 | if ( mediaPlayerState->streaming() ) { |
309 | // qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); | 308 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); |
310 | // if( !slider.isHidden()) slider.hide(); | 309 | if( !slider.isHidden()) { |
311 | // disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 310 | slider.hide(); |
312 | // disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 311 | } |
313 | // } else { | 312 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
313 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | ||
314 | } else { | ||
314 | // this stops the slider from being moved, thus | 315 | // this stops the slider from being moved, thus |
315 | // does not stop stream when it reaches the end | 316 | // does not stop stream when it reaches the end |
316 | // slider.show(); | 317 | slider.show(); |
317 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 318 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
318 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 319 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
319 | // } | 320 | } |
320 | 321 | ||
321 | if ( view == 'a' ) { | 322 | if ( view == 'a' ) { |
322 | startTimer( 150 ); | 323 | // startTimer( 150 ); |
323 | showMaximized(); | 324 | showMaximized(); |