mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-15 10:33:59 +02:00
Code Issues Releases Wiki Activity

Fix seeker getting "stuck" if it goes ahead on some tracks

Browse Source
This commit is contained in:
Jeff Mitchell
2011-08-28 16:47:14 -04:00
parent 271e6c480d
commit 4fc7c6415b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/audiocontrols.cpp
View File

@@ -333,7 +333,7 @@ AudioControls::onPlaybackResumed()
void void
AudioControls::onPlaybackSeeked( qint64 msec ) AudioControls::onPlaybackSeeked( qint64 msec )
{ {
//tDebug( LOGEXTRA ) << Q_FUNC_INFO << " setting current timer to " << msec; tDebug( LOGEXTRA ) << Q_FUNC_INFO << " setting current timer to " << msec;
m_sliderTimeLine.setPaused( true ); m_sliderTimeLine.setPaused( true );
m_sliderTimeLine.setCurrentTime( msec ); m_sliderTimeLine.setCurrentTime( msec );
m_seekMsecs = msec; m_seekMsecs = msec;
@@ -375,11 +375,12 @@ AudioControls::onPlaybackTimer( qint64 msElapsed )
ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) ); ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) );
ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) ); ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
if ( m_sliderTimeLine.currentTime() > msElapsed || ( m_seekMsecs != -1 && m_sliderTimeLine.currentTime() < msElapsed ) ) if ( m_sliderTimeLine.currentTime() > msElapsed || m_seekMsecs != -1 )
{ {
m_sliderTimeLine.setPaused( true ); m_sliderTimeLine.setPaused( true );
m_sliderTimeLine.setCurrentTime( msElapsed ); m_sliderTimeLine.setCurrentTime( msElapsed );
m_seekMsecs = -1; m_seekMsecs = -1;
if ( AudioEngine::instance()->state() != AudioEngine::Paused )
m_sliderTimeLine.resume(); m_sliderTimeLine.resume();
} }
else if ( m_sliderTimeLine.duration() > msElapsed && m_sliderTimeLine.state() == QTimeLine::NotRunning ) else if ( m_sliderTimeLine.duration() > msElapsed && m_sliderTimeLine.state() == QTimeLine::NotRunning )