mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +02:00
Code Issues Releases Wiki Activity

* Set current track's playlist correctly.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-09-10 09:29:17 +02:00
parent fd72e7fa4e
commit 46ffedf530
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libtomahawk/audio/audioengine.cpp
View File

@@ -195,7 +195,7 @@ AudioEngine::previous()
{ {
tDebug( LOGEXTRA ) << Q_FUNC_INFO; tDebug( LOGEXTRA ) << Q_FUNC_INFO;
if( canGoPrevious() ) if ( canGoPrevious() )
loadPreviousTrack(); loadPreviousTrack();
} }
@@ -205,7 +205,7 @@ AudioEngine::next()
{ {
tDebug( LOGEXTRA ) << Q_FUNC_INFO; tDebug( LOGEXTRA ) << Q_FUNC_INFO;
if( canGoNext() ) if ( canGoNext() )
loadNextTrack(); loadNextTrack();
} }
@@ -525,19 +525,21 @@ AudioEngine::loadNextTrack()
if ( !m_playlist.isNull() && result.isNull() ) if ( !m_playlist.isNull() && result.isNull() )
{ {
tDebug( LOGEXTRA ) << Q_FUNC_INFO << " loading playlist's next item"; tDebug( LOGEXTRA ) << Q_FUNC_INFO << "Loading playlist's next item";
result = m_playlist.data()->nextItem(); result = m_playlist.data()->nextItem();
m_currentTrackPlaylist = m_playlist;
} }
if ( !result.isNull() ) if ( !result.isNull() )
{ {
tDebug( LOGEXTRA ) << Q_FUNC_INFO << " got next item, loading track"; tDebug( LOGEXTRA ) << Q_FUNC_INFO << "Got next item, loading track";
loadTrack( result ); loadTrack( result );
} }
else else
{ {
if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistInterface::Retry ) if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistInterface::Retry )
m_waitingOnNewTrack = true; m_waitingOnNewTrack = true;
stop(); stop();
} }
} }