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

Store mRepeatStart as a position rather than a pointer

Browse Source
This commit is contained in:
Christopher Eby 2010-04-12 19:14:51 -05:00
parent 478c732673
commit eb74963785
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/org/kreed/vanilla/PlaybackService.java
View File

@ -109,7 +109,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
private boolean mIgnoreNextUp; private boolean mIgnoreNextUp;
private boolean mLoaded; private boolean mLoaded;
boolean mInCall; boolean mInCall;
private Song mRepeatStart; private int mRepeatStart = -1;
private ArrayList<Song> mRepeatedSongs; private ArrayList<Song> mRepeatedSongs;
private Method mIsWiredHeadsetOn; private Method mIsWiredHeadsetOn;
@ -373,10 +373,10 @@ public final class PlaybackService extends Service implements Handler.Callback,
// The current song is the starting point for repeated tracks // The current song is the starting point for repeated tracks
if ((state & FLAG_REPEAT) != 0 && (oldState & FLAG_REPEAT) == 0) { if ((state & FLAG_REPEAT) != 0 && (oldState & FLAG_REPEAT) == 0) {
song.flags &= ~Song.FLAG_RANDOM; song.flags &= ~Song.FLAG_RANDOM;
mRepeatStart = song; mRepeatStart = mTimelinePos;
broadcastReplaceSong(+1); broadcastReplaceSong(+1);
} else if ((state & FLAG_REPEAT) == 0 && (oldState & FLAG_REPEAT) != 0) { } else if ((state & FLAG_REPEAT) == 0 && (oldState & FLAG_REPEAT) != 0) {
mRepeatStart = null; mRepeatStart = -1;
broadcastReplaceSong(+1); broadcastReplaceSong(+1);
} }
@ -460,8 +460,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
{ {
ArrayList<Song> songs = mRepeatedSongs; ArrayList<Song> songs = mRepeatedSongs;
if (songs == null) { if (songs == null) {
int start = mSongTimeline.lastIndexOf(mRepeatStart); songs = new ArrayList<Song>(mSongTimeline.subList(mRepeatStart, end));
songs = new ArrayList<Song>(mSongTimeline.subList(start, end));
Collections.shuffle(songs, ContextApplication.getRandom()); Collections.shuffle(songs, ContextApplication.getRandom());
mRepeatedSongs = songs; mRepeatedSongs = songs;
} }
@ -483,15 +482,14 @@ public final class PlaybackService extends Service implements Handler.Callback,
ArrayList<Song> timeline = mSongTimeline; ArrayList<Song> timeline = mSongTimeline;
synchronized (timeline) { synchronized (timeline) {
if (delta == 1 && mRepeatStart != null && (timeline.get(mTimelinePos + 1).flags & Song.FLAG_RANDOM) != 0) { if (delta == 1 && mRepeatStart >= 0 && (timeline.get(mTimelinePos + 1).flags & Song.FLAG_RANDOM) != 0) {
if ((mState & FLAG_SHUFFLE) == 0) { if ((mState & FLAG_SHUFFLE) == 0) {
mTimelinePos = mSongTimeline.lastIndexOf(mRepeatStart); mTimelinePos = mRepeatStart;
} else { } else {
int j = mTimelinePos + delta; int j = mTimelinePos + delta;
ArrayList<Song> songs = getShuffledRepeatedSongs(j); ArrayList<Song> songs = getShuffledRepeatedSongs(j);
for (int i = songs.size(); --i != -1 && --j != -1; ) for (int i = songs.size(); --i != -1 && --j != -1; )
mSongTimeline.set(j, songs.get(i)); mSongTimeline.set(j, songs.get(i));
mRepeatStart = songs.get(0);
mRepeatedSongs = null; mRepeatedSongs = null;
mTimelinePos = j; mTimelinePos = j;
} }
@ -563,15 +561,13 @@ public final class PlaybackService extends Service implements Handler.Callback,
song = timeline.get(pos); song = timeline.get(pos);
} }
if (mRepeatStart != null) { if (delta == 1 && mRepeatStart >= 0 && (song.flags & Song.FLAG_RANDOM) != 0) {
if (delta == 1 && (song.flags & Song.FLAG_RANDOM) != 0) { // We have reached a non-user-selected song; this song will
// We have reached a non-user-selected song; this song will // repeated in setCurrentSong so take alternative measures
// repeated in setCurrentSong so take alternative measures if ((mState & FLAG_SHUFFLE) == 0)
if ((mState & FLAG_SHUFFLE) == 0) song = timeline.get(mRepeatStart);
song = mRepeatStart; else
else song = getShuffledRepeatedSongs(mTimelinePos + delta).get(0);
song = getShuffledRepeatedSongs(mTimelinePos + delta).get(0);
}
} }
} }
@ -835,6 +831,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
while (mTimelinePos > 15) { while (mTimelinePos > 15) {
mSongTimeline.remove(0); mSongTimeline.remove(0);
--mTimelinePos; --mTimelinePos;
--mRepeatStart;
} }
} }