Commit 49691e51 by Andrew Lewis Committed by GitHub

Merge pull request #4252 from pedromfmachado/save_current_subtitle_cues

Saving current subtitle cues on SimpleExoPlayer
parents 203f737b 2c55f589
...@@ -92,6 +92,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player ...@@ -92,6 +92,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player
private AudioAttributes audioAttributes; private AudioAttributes audioAttributes;
private float audioVolume; private float audioVolume;
private MediaSource mediaSource; private MediaSource mediaSource;
private @Nullable List<Cue> currentCues;
/** /**
* @param renderersFactory A factory for creating {@link Renderer}s to be used by the instance. * @param renderersFactory A factory for creating {@link Renderer}s to be used by the instance.
...@@ -502,6 +503,9 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player ...@@ -502,6 +503,9 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player
@Override @Override
public void addTextOutput(TextOutput listener) { public void addTextOutput(TextOutput listener) {
if(currentCues != null) {
listener.onCues(currentCues);
}
textOutputs.add(listener); textOutputs.add(listener);
} }
...@@ -775,6 +779,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player ...@@ -775,6 +779,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player
mediaSource = null; mediaSource = null;
analyticsCollector.resetForNewMediaSource(); analyticsCollector.resetForNewMediaSource();
} }
currentCues = null;
} }
@Override @Override
...@@ -790,6 +795,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player ...@@ -790,6 +795,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player
if (mediaSource != null) { if (mediaSource != null) {
mediaSource.removeEventListener(analyticsCollector); mediaSource.removeEventListener(analyticsCollector);
} }
currentCues = null;
} }
@Override @Override
...@@ -1095,6 +1101,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player ...@@ -1095,6 +1101,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player
@Override @Override
public void onCues(List<Cue> cues) { public void onCues(List<Cue> cues) {
currentCues = cues;
for (TextOutput textOutput : textOutputs) { for (TextOutput textOutput : textOutputs) {
textOutput.onCues(cues); textOutput.onCues(cues);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment