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

Disable repeat option when there are no songs

Browse Source
This commit is contained in:
Christopher Eby 2011-09-11 15:14:33 -05:00
parent cf776d40bb
commit cb1221e00c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/kreed/vanilla/PlaybackActivity.java
View File

@ -310,6 +310,8 @@ public class PlaybackActivity extends Activity implements Handler.Callback, View
menu.findItem(MENU_SHUFFLE).setTitle(isShuffling ? R.string.shuffle_disable : R.string.shuffle_enable); menu.findItem(MENU_SHUFFLE).setTitle(isShuffling ? R.string.shuffle_disable : R.string.shuffle_enable);
boolean isRepeating = (mState & PlaybackService.FLAG_REPEAT) != 0; boolean isRepeating = (mState & PlaybackService.FLAG_REPEAT) != 0;
menu.findItem(MENU_REPEAT).setTitle(isRepeating ? R.string.repeat_disable : R.string.repeat_enable); menu.findItem(MENU_REPEAT).setTitle(isRepeating ? R.string.repeat_disable : R.string.repeat_enable);
if ((mState & PlaybackService.FLAG_NO_MEDIA) != 0)
menu.findItem(MENU_REPEAT).setEnabled(false);
return true; return true;
} }

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

@ -431,9 +431,6 @@ public final class PlaybackService extends Service implements Handler.Callback,
Toast.makeText(this, text, Toast.LENGTH_LONG).show(); Toast.makeText(this, text, Toast.LENGTH_LONG).show();
} }
if (mCurrentSong == null)
state &= ~FLAG_REPEAT;
int oldState = mState; int oldState = mState;
mState = state; mState = state;

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

@ -238,10 +238,13 @@ public final class SongTimeline {
synchronized (this) { synchronized (this) {
if (repeat) { if (repeat) {
Song song = getSong(0);
if (song == null)
return;
mRepeatStart = mCurrentPos; mRepeatStart = mCurrentPos;
// Ensure that we will at least repeat one song (the current song), // Ensure that we will at least repeat one song (the current song),
// even if all of our songs were selected randomly. // even if all of our songs were selected randomly.
getSong(0).flags &= ~Song.FLAG_RANDOM; song.flags &= ~Song.FLAG_RANDOM;
} else { } else {
mRepeatStart = -1; mRepeatStart = -1;
mRepeatedSongs = null; mRepeatedSongs = null;