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

rename PLAY_NEXT into more descriptive FLUSH_AND_PLAY_NEXT

Browse Source
This commit is contained in:
Adrian Ulrich 2015-02-15 17:24:36 +01:00
parent 7d21710015
commit 18bc1fb319
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ch/blinkenlights/android/vanilla/PlaybackService.java
View File

@ -1568,7 +1568,7 @@ public final class PlaybackService extends Service
if (count != 0 && (mState & FLAG_PLAYING) == 0) if (count != 0 && (mState & FLAG_PLAYING) == 0)
setFlag(FLAG_PLAYING); setFlag(FLAG_PLAYING);
break; break;
case SongTimeline.MODE_PLAY_NEXT: case SongTimeline.MODE_FLUSH_AND_PLAY_NEXT:
case SongTimeline.MODE_ENQUEUE: case SongTimeline.MODE_ENQUEUE:
case SongTimeline.MODE_ENQUEUE_ID_FIRST: case SongTimeline.MODE_ENQUEUE_ID_FIRST:
case SongTimeline.MODE_ENQUEUE_POS_FIRST: case SongTimeline.MODE_ENQUEUE_POS_FIRST:
@ -1624,7 +1624,7 @@ public final class PlaybackService extends Service
String selection = "_id!=" + current.id; String selection = "_id!=" + current.id;
QueryTask query = MediaUtils.buildQuery(type, id, Song.FILLED_PROJECTION, selection); QueryTask query = MediaUtils.buildQuery(type, id, Song.FILLED_PROJECTION, selection);
query.mode = SongTimeline.MODE_PLAY_NEXT; query.mode = SongTimeline.MODE_FLUSH_AND_PLAY_NEXT;
addSongs(query); addSongs(query);
} }

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

@ -96,7 +96,7 @@ public final class SongTimeline {
* *
* @see SongTimeline#addSongs(Context, QueryTask) * @see SongTimeline#addSongs(Context, QueryTask)
*/ */
public static final int MODE_PLAY_NEXT = 1; public static final int MODE_FLUSH_AND_PLAY_NEXT = 1;
/** /**
* Add the songs at the end of the timeline, clearing random songs. * Add the songs at the end of the timeline, clearing random songs.
* *
@ -665,7 +665,7 @@ public final class SongTimeline {
} }
} }
break; break;
case MODE_PLAY_NEXT: case MODE_FLUSH_AND_PLAY_NEXT:
timeline.subList(mCurrentPos + 1, timeline.size()).clear(); timeline.subList(mCurrentPos + 1, timeline.size()).clear();
break; break;
case MODE_PLAY: case MODE_PLAY: