Skip to content

SDK / exoplayer

Go to a project
Commit 2566b246 by olly Committed by Oliver Woodman
Options

Remove deprecated Listener.onTimelineChanged 

PiperOrigin-RevId: 374171038
parent 0c80a54b
Inline Side-by-side
Showing with 6 additions and 40 deletions
RELEASENOTES.md
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
* Remove `Player.getPlaybackError`. Use `Player.getPlayerError` instead. * Remove `Player.getPlaybackError`. Use `Player.getPlayerError` instead.
* Remove `Player.getCurrentTag`. Use `Player.getCurrentMediaItem` and * Remove `Player.getCurrentTag`. Use `Player.getCurrentMediaItem` and
`MediaItem.PlaybackProperties.tag` instead. `MediaItem.PlaybackProperties.tag` instead.
* Remove `Player.Listener.onTimelineChanged(Timeline, Object, int)`. Use
`Player.Listener.onTimelineChanged(Timeline, int)` instead. The manifest
can be accessed using `Player.getCurrentManifest`.
* Remove `PlaybackPreparer`. UI components that previously had * Remove `PlaybackPreparer`. UI components that previously had
`setPlaybackPreparer` methods will now call `Player.prepare` by default. `setPlaybackPreparer` methods will now call `Player.prepare` by default.
If this behavior is sufficient, use of `PlaybackPreparer` can be removed If this behavior is sufficient, use of `PlaybackPreparer` can be removed
......
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
...@@ -804,11 +804,8 @@ public final class CastPlayer extends BasePlayer { ...@@ -804,11 +804,8 @@ public final class CastPlayer extends BasePlayer {
// Call onTimelineChanged. // Call onTimelineChanged.
listeners.queueEvent( listeners.queueEvent(
Player.EVENT_TIMELINE_CHANGED, Player.EVENT_TIMELINE_CHANGED,
listener -> { listener ->
listener.onTimelineChanged( listener.onTimelineChanged(timeline, Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE));
timeline, /* manifest= */ null, Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE);
listener.onTimelineChanged(timeline, Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE);
});
// Call onPositionDiscontinuity if required. // Call onPositionDiscontinuity if required.
Timeline currentTimeline = getCurrentTimeline(); Timeline currentTimeline = getCurrentTimeline();
......
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
...@@ -741,15 +741,6 @@ public class ForwardingPlayer implements Player { ...@@ -741,15 +741,6 @@ public class ForwardingPlayer implements Player {
} }
@Override @Override
@SuppressWarnings("deprecation") // Forwarding to deprecated method.
public void onTimelineChanged(
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
listeners.sendEvent(
EVENT_TIMELINE_CHANGED,
listener -> listener.onTimelineChanged(timeline, manifest, reason));
}
@Override
public void onMediaItemTransition( public void onMediaItemTransition(
@Nullable MediaItem mediaItem, @MediaItemTransitionReason int reason) { @Nullable MediaItem mediaItem, @MediaItemTransitionReason int reason) {
listeners.sendEvent( listeners.sendEvent(
...@@ -907,13 +898,6 @@ public class ForwardingPlayer implements Player { ...@@ -907,13 +898,6 @@ public class ForwardingPlayer implements Player {
// EventListener callbacks // EventListener callbacks
@Override @Override
@SuppressWarnings("deprecation") // Forwarding to deprecated method.
public void onTimelineChanged(
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
listener.onTimelineChanged(timeline, manifest, reason);
}
@Override
public void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) { public void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) {
listener.onTimelineChanged(timeline, reason); listener.onTimelineChanged(timeline, reason);
} }
......
library/common/src/main/java/com/google/android/exoplayer2/Player.java
...@@ -97,15 +97,6 @@ public interface Player { ...@@ -97,15 +97,6 @@ public interface Player {
default void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) {} default void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) {}
/** /**
* @deprecated Use {@link #onTimelineChanged(Timeline, int)} instead. The manifest can be
* accessed by using {@link #getCurrentManifest()} or {@code timeline.getWindow(windowIndex,
* window).manifest} for a given window index.
*/
@Deprecated
default void onTimelineChanged(
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {}
/**
* Called when playback transitions to a media item or starts repeating a media item according * Called when playback transitions to a media item or starts repeating a media item according
* to the current {@link #getRepeatMode() repeat mode}. * to the current {@link #getRepeatMode() repeat mode}.
* *
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
...@@ -1233,16 +1233,7 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -1233,16 +1233,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
if (!previousPlaybackInfo.timeline.equals(newPlaybackInfo.timeline)) { if (!previousPlaybackInfo.timeline.equals(newPlaybackInfo.timeline)) {
listeners.queueEvent( listeners.queueEvent(
Player.EVENT_TIMELINE_CHANGED, Player.EVENT_TIMELINE_CHANGED,
listener -> { listener -> listener.onTimelineChanged(newPlaybackInfo.timeline, timelineChangeReason));
@Nullable Object manifest = null;
if (newPlaybackInfo.timeline.getWindowCount() == 1) {
// Legacy behavior was to report the manifest for single window timelines only.
Timeline.Window window = new Timeline.Window();
manifest = newPlaybackInfo.timeline.getWindow(0, window).manifest;
}
listener.onTimelineChanged(newPlaybackInfo.timeline, manifest, timelineChangeReason);
listener.onTimelineChanged(newPlaybackInfo.timeline, timelineChangeReason);
});
} }
if (positionDiscontinuity) { if (positionDiscontinuity) {
PositionInfo previousPositionInfo = PositionInfo previousPositionInfo =
......
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