norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

use generic approach to detect if we removed the end of our queue

Browse Source
This commit is contained in:
Adrian Ulrich 2014-10-18 15:17:11 +02:00
parent 9f6f72371a
commit 59d61ce8dd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ch/blinkenlights/android/vanilla/SongTimeline.java
View File

@ -816,14 +816,15 @@ public final class SongTimeline {
while (it.hasNext()) {
int i = it.nextIndex();
if (Song.getId(it.next()) == id) {
if (i == mCurrentPos && isEndOfQueue())
mCurrentPos = 0;
if (i < mCurrentPos)
--mCurrentPos;
it.remove();
}
}
if (getSong(1) == null)
mCurrentPos = 0;
broadcastChangedSongs();
}
@ -838,12 +839,12 @@ public final class SongTimeline {
synchronized (this) {
saveActiveSongs();
if (pos == mCurrentPos && isEndOfQueue()) // currently playing and at the and -> go to start
mCurrentPos = 0;
mSongs.remove(pos);
if (pos < mCurrentPos)
mCurrentPos--;
mSongs.remove(pos);
if (getSong(1) == null) // wrap around if this was the last song
mCurrentPos = 0;
broadcastChangedSongs();
}