diff options
| -rw-r--r-- | src/qmmpui/mediaplayer.cpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index f6db0a0ec..d6f2d9975 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.cpp @@ -133,7 +133,25 @@ void MediaPlayer::playNext() } if (!m_pl_manager->currentPlayList()->next()) { - stop(); + if(!m_settings->isPlayListTransitionEnabled()) + { + stop(); + return; + } + //next playlist + int index = m_pl_manager->currentPlayListIndex() + 1; + PlayListModel *nextPlayList = index < m_pl_manager->count() ? m_pl_manager->playListAt(index) : nullptr; + PlayListTrack *nextTrack = nextPlayList ? nextPlayList->currentTrack() : nullptr; + if(nextTrack) + { + m_pl_manager->selectPlayList(nextPlayList); + m_pl_manager->activatePlayList(nextPlayList); + play(); + } + else + { + stop(); + } return; } play(); @@ -148,6 +166,13 @@ void MediaPlayer::updateNextUrl() else if(!m_settings->isNoPlayListAdvance()) track = m_pl_manager->currentPlayList()->nextTrack(); + if(!track && m_settings->isPlayListTransitionEnabled()) + { + int index = m_pl_manager->currentPlayListIndex() + 1; + PlayListModel *nextPlayList = index < m_pl_manager->count() ? m_pl_manager->playListAt(index) : nullptr; + track = nextPlayList ? nextPlayList->currentTrack() : nullptr; + } + if(track) { bool ok = m_core->play(track->path(), true); |