sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't query empty timeline for next/previous windows

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173668909
This commit is contained in:
olly 2017-10-27 07:33:34 -07:00 committed by Oliver Woodman
parent 4cf90e3223
commit dd5905a9fb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
View file

@ -331,14 +331,14 @@ import java.util.concurrent.CopyOnWriteArraySet;
@Override @Override
public int getNextWindowIndex() { public int getNextWindowIndex() {
return timeline.getNextWindowIndex(getCurrentWindowIndex(), getRepeatMode(), return timeline.isEmpty() ? C.INDEX_UNSET
getShuffleModeEnabled()); : timeline.getNextWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
} }
@Override @Override
public int getPreviousWindowIndex() { public int getPreviousWindowIndex() {
return timeline.getPreviousWindowIndex(getCurrentWindowIndex(), getRepeatMode(), return timeline.isEmpty() ? C.INDEX_UNSET
getShuffleModeEnabled()); : timeline.getPreviousWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
} }
@Override @Override

2
library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
View file

@ -564,7 +564,7 @@ public abstract class Timeline {
boolean shuffleModeEnabled) { boolean shuffleModeEnabled) {
switch (repeatMode) { switch (repeatMode) {
case Player.REPEAT_MODE_OFF: case Player.REPEAT_MODE_OFF:
return windowIndex == getLastWindowIndex(shuffleModeEnabled) ? C.INDEX_UNSET return windowIndex == getLastWindowIndex(shuffleModeEnabled) ? C.INDEX_UNSET
: windowIndex + 1; : windowIndex + 1;
case Player.REPEAT_MODE_ONE: case Player.REPEAT_MODE_ONE:
return windowIndex; return windowIndex;