mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-12-27 21:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where deleting the currently playing item from the play queue

Browse Source 
would cause the second, instead of first, track in the queue to start
playing.
This commit is contained in:
casey langen 2017-01-21 22:28:43 -08:00
parent ce24a7064b
commit 6f51debdde
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/audio/PlaybackService.cpp
View File

@ -59,6 +59,7 @@ using musik::core::audio::ITransport;
using Editor = PlaybackService::Editor;
#define NO_POSITION (size_t) -1
#define START_OVER (size_t) -2
#define URI_AT_INDEX(x) this->playlist.Get(x)->Uri()
@ -172,8 +173,18 @@ void PlaybackService::PrepareNextTrack() {
this->transport.PrepareNextTrack(URI_AT_INDEX(this->index));
}
else {
/* annoying and confusing special case -- the user edited the
playlist and deleted the currently playing item. let's start
again from the top... */
if (this->index == START_OVER) {
if (this->playlist.Count() > 0) {
this->index = NO_POSITION;
this->nextIndex = 0;
this->transport.PrepareNextTrack(URI_AT_INDEX(nextIndex));
}
}
/* normal case, just move forward */
if (this->playlist.Count() > this->index + 1) {
else if (this->playlist.Count() > this->index + 1) {
if (this->nextIndex != this->index + 1) {
this->nextIndex = this->index + 1;
this->transport.PrepareNextTrack(URI_AT_INDEX(nextIndex));
@ -605,7 +616,7 @@ bool PlaybackService::Editor::Delete(size_t index) {
this->playIndex = NO_POSITION;
}
if (index == this->playIndex) {
this->playIndex = 0;
this->playIndex = START_OVER;
}
else if (index < this->playIndex) {
--this->playIndex;