Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2566b246
authored
May 17, 2021
by
olly
Committed by
Oliver Woodman
May 17, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Remove deprecated Listener.onTimelineChanged
PiperOrigin-RevId: 374171038
parent
0c80a54b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
40 deletions
RELEASENOTES.md
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
library/common/src/main/java/com/google/android/exoplayer2/Player.java
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
RELEASENOTES.md
View file @
2566b246
...
...
@@ -9,6 +9,9 @@
*
Remove
`Player.getPlaybackError`
. Use
`Player.getPlayerError`
instead.
*
Remove
`Player.getCurrentTag`
. Use
`Player.getCurrentMediaItem`
and
`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
`setPlaybackPreparer`
methods will now call
`Player.prepare`
by default.
If this behavior is sufficient, use of
`PlaybackPreparer`
can be removed
...
...
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
View file @
2566b246
...
...
@@ -804,11 +804,8 @@ public final class CastPlayer extends BasePlayer {
// Call onTimelineChanged.
listeners
.
queueEvent
(
Player
.
EVENT_TIMELINE_CHANGED
,
listener
->
{
listener
.
onTimelineChanged
(
timeline
,
/* manifest= */
null
,
Player
.
TIMELINE_CHANGE_REASON_SOURCE_UPDATE
);
listener
.
onTimelineChanged
(
timeline
,
Player
.
TIMELINE_CHANGE_REASON_SOURCE_UPDATE
);
});
listener
->
listener
.
onTimelineChanged
(
timeline
,
Player
.
TIMELINE_CHANGE_REASON_SOURCE_UPDATE
));
// Call onPositionDiscontinuity if required.
Timeline
currentTimeline
=
getCurrentTimeline
();
...
...
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
View file @
2566b246
...
...
@@ -741,15 +741,6 @@ public class ForwardingPlayer implements Player {
}
@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
(
@Nullable
MediaItem
mediaItem
,
@MediaItemTransitionReason
int
reason
)
{
listeners
.
sendEvent
(
...
...
@@ -907,13 +898,6 @@ public class ForwardingPlayer implements Player {
// EventListener callbacks
@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
)
{
listener
.
onTimelineChanged
(
timeline
,
reason
);
}
...
...
library/common/src/main/java/com/google/android/exoplayer2/Player.java
View file @
2566b246
...
...
@@ -97,15 +97,6 @@ public interface Player {
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
* to the current {@link #getRepeatMode() repeat mode}.
*
...
...
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
View file @
2566b246
...
...
@@ -1233,16 +1233,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
if
(!
previousPlaybackInfo
.
timeline
.
equals
(
newPlaybackInfo
.
timeline
))
{
listeners
.
queueEvent
(
Player
.
EVENT_TIMELINE_CHANGED
,
listener
->
{
@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
);
});
listener
->
listener
.
onTimelineChanged
(
newPlaybackInfo
.
timeline
,
timelineChangeReason
));
}
if
(
positionDiscontinuity
)
{
PositionInfo
previousPositionInfo
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment