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

Shuffle current songs when enabling shuffling

Browse Source
This commit is contained in:
Christopher Eby 2011-09-21 16:52:01 -05:00
parent 8e83d85a59
commit 48e2aa1d91
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/kreed/vanilla/SongTimeline.java
View File

@ -333,14 +333,29 @@ public final class SongTimeline {
}
/**
* Set whether shuffling is enabled. Shuffling will shuffle sets of songs
* that are added with chooseSongs and shuffle sets of repeated songs.
* Set whether shuffling is enabled. Will shuffle the current set of songs
* when enabling shuffling if random mode is not enabled.
*/
public void setShuffle(boolean shuffle)
{
saveActiveSongs();
mShuffle = shuffle;
broadcastChangedSongs();
if (shuffle == mShuffle)
return;
synchronized (this) {
saveActiveSongs();
mShuffle = shuffle;
if (shuffle && mFinishAction != FINISH_RANDOM) {
shuffleAll();
ArrayList<Song> songs = mShuffledSongs;
mShuffledSongs = null;
int i = songs.indexOf(mSavedCurrent);
songs.set(i, songs.get(mCurrentPos));
songs.set(mCurrentPos, mSavedCurrent);
mSongs = songs;
}
broadcastChangedSongs();
}
changed();
}