loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-08 08:00:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix demo app to avoid seeking if resume position is clear

Browse Source 
This fixed the resume live window issue by modifying the demo app.

Issue:#2344

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=145987470
This commit is contained in:
aquilescanta 2017-01-30 07:00:28 -08:00 committed by Oliver Woodman
parent 9a90795041
commit 7ee8567f4a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View File

@ -317,8 +317,11 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
} }
MediaSource mediaSource = mediaSources.length == 1 ? mediaSources[0] MediaSource mediaSource = mediaSources.length == 1 ? mediaSources[0]
: new ConcatenatingMediaSource(mediaSources); : new ConcatenatingMediaSource(mediaSources);
player.seekTo(resumeWindow, resumePosition); boolean haveResumePosition = resumeWindow != C.INDEX_UNSET;
player.prepare(mediaSource, false, false); if (haveResumePosition) {
player.seekTo(resumeWindow, resumePosition);
}
player.prepare(mediaSource, !haveResumePosition, !haveResumePosition);
playerNeedsSource = false; playerNeedsSource = false;
updateButtonVisibilities(); updateButtonVisibilities();
} }
@ -377,7 +380,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
} }
private void clearResumePosition() { private void clearResumePosition() {
resumeWindow = 0; resumeWindow = C.INDEX_UNSET;
resumePosition = C.TIME_UNSET; resumePosition = C.TIME_UNSET;
} }

4
library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
View File

@ -479,8 +479,8 @@ public class SimpleExoPlayer implements ExoPlayer {
} }
@Override @Override
public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetTimeline) { public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
player.prepare(mediaSource, resetPosition, resetTimeline); player.prepare(mediaSource, resetPosition, resetState);
} }
@Override @Override