diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java index 2f48ffe98a..c58ec7b708 100644 --- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java +++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java @@ -366,7 +366,7 @@ public final class CastPlayer extends BasePlayer { return playWhenReady.value; } - // We still call EventListener#onSeekProcessed() for backwards compatibility with listeners that + // We still call Listener#onSeekProcessed() for backwards compatibility with listeners that // don't implement onPositionDiscontinuity(). @SuppressWarnings("deprecation") @Override @@ -788,7 +788,7 @@ public final class CastPlayer extends BasePlayer { } /** - * Updates the timeline and notifies {@link Player.EventListener event listeners} if required. + * Updates the timeline and notifies {@link Player.Listener event listeners} if required. * * @return Whether the timeline change has caused a change of the period currently being played. */ @@ -1291,7 +1291,7 @@ public final class CastPlayer extends BasePlayer { private final class SeekResultCallback implements ResultCallback { - // We still call EventListener#onSeekProcessed() for backwards compatibility with listeners that + // We still call Listener#onSeekProcessed() for backwards compatibility with listeners that // don't implement onPositionDiscontinuity(). @SuppressWarnings("deprecation") @Override diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java b/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java index eb78179752..5ae782c051 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java @@ -426,9 +426,8 @@ public class ForwardingPlayer extends BasePlayer { } /** - * Wraps a {@link Listener} and intercepts {@link EventListener#onAvailableCommandsChanged} in - * order to filter disabled commands. All other operations are forwarded to the wrapped {@link - * Listener}. + * Wraps a {@link Listener} and intercepts {@link Listener#onAvailableCommandsChanged} in order to + * filter disabled commands. All other operations are forwarded to the wrapped {@link Listener}. */ private static class ForwardingListener implements Listener { private final ForwardingPlayer player; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index fa9261835b..fea534ca2e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -243,7 +243,7 @@ import java.util.concurrent.CopyOnWriteArraySet; /** * Set a limit on the time a call to {@link #setForegroundMode} can spend. If a call to {@link * #setForegroundMode} takes more than {@code timeoutMs} milliseconds to complete, the player will - * raise an error via {@link Player.EventListener#onPlayerError}. + * raise an error via {@link Player.Listener#onPlayerError}. * *

This method is experimental, and will be renamed or removed in a future release. It should * only be called before the player is used. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java b/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java index 4191480700..57c70cd5ca 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java @@ -246,7 +246,7 @@ public final class PlayerMessage { /** * Sends the message. If the target throws an {@link ExoPlaybackException} then it is propagated * out of the player as an error using {@link - * Player.EventListener#onPlayerError(ExoPlaybackException)}. + * Player.Listener#onPlayerError(ExoPlaybackException)}. * * @return This message. * @throws IllegalStateException If this message has already been sent. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java index b345be32e3..6550c5ac05 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java @@ -241,7 +241,7 @@ public interface AnalyticsListener { int EVENT_PLAYER_ERROR = Player.EVENT_PLAYER_ERROR; /** * A position discontinuity occurred. See {@link - * Player.EventListener#onPositionDiscontinuity(Player.PositionInfo, Player.PositionInfo, int)}. + * Player.Listener#onPositionDiscontinuity(Player.PositionInfo, Player.PositionInfo, int)}. */ int EVENT_POSITION_DISCONTINUITY = Player.EVENT_POSITION_DISCONTINUITY; /** {@link Player#getPlaybackParameters()} changed. */ @@ -651,8 +651,7 @@ public interface AnalyticsListener { * *

The provided {@link MediaMetadata} is a combination of the {@link MediaItem#mediaMetadata} * and the static and dynamic metadata sourced from {@link - * Player.EventListener#onStaticMetadataChanged(List)} and {@link - * MetadataOutput#onMetadata(Metadata)}. + * Player.Listener#onStaticMetadataChanged(List)} and {@link MetadataOutput#onMetadata(Metadata)}. * * @param eventTime The event time. * @param mediaMetadata The combined {@link MediaMetadata}. @@ -695,9 +694,9 @@ public interface AnalyticsListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error. Hence applications should not * implement this method to display a user visible error or initiate an application level retry. - * {@link Player.EventListener#onPlayerError} is the appropriate place to implement such behavior. - * This method is called to provide the application with an opportunity to log the error if it - * wishes to do so. + * {@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior. This + * method is called to provide the application with an opportunity to log the error if it wishes + * to do so. * * @param eventTime The event time. * @param loadEventInfo The {@link LoadEventInfo} defining the load event. @@ -890,9 +889,9 @@ public interface AnalyticsListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error. Hence applications should not * implement this method to display a user visible error or initiate an application level retry. - * {@link Player.EventListener#onPlayerError} is the appropriate place to implement such behavior. - * This method is called to provide the application with an opportunity to log the error if it - * wishes to do so. + * {@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior. This + * method is called to provide the application with an opportunity to log the error if it wishes + * to do so. * * @param eventTime The event time. * @param audioSinkError The error that occurred. Typically an {@link @@ -907,9 +906,9 @@ public interface AnalyticsListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error. Hence applications should not * implement this method to display a user visible error or initiate an application level retry. - * {@link Player.EventListener#onPlayerError} is the appropriate place to implement such behavior. - * This method is called to provide the application with an opportunity to log the error if it - * wishes to do so. + * {@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior. This + * method is called to provide the application with an opportunity to log the error if it wishes + * to do so. * * @param eventTime The event time. * @param audioCodecError The error. Typically a {@link CodecException} if the renderer uses @@ -1025,9 +1024,9 @@ public interface AnalyticsListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error. Hence applications should not * implement this method to display a user visible error or initiate an application level retry. - * {@link Player.EventListener#onPlayerError} is the appropriate place to implement such behavior. - * This method is called to provide the application with an opportunity to log the error if it - * wishes to do so. + * {@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior. This + * method is called to provide the application with an opportunity to log the error if it wishes + * to do so. * * @param eventTime The event time. * @param videoCodecError The error. Typically a {@link CodecException} if the renderer uses @@ -1100,9 +1099,9 @@ public interface AnalyticsListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error. Hence applications should not * implement this method to display a user visible error or initiate an application level retry. - * {@link Player.EventListener#onPlayerError} is the appropriate place to implement such behavior. - * This method is called to provide the application with an opportunity to log the error if it - * wishes to do so. + * {@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior. This + * method is called to provide the application with an opportunity to log the error if it wishes + * to do so. * * @param eventTime The event time. * @param error The error. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java index e3f2e11be4..d948f0feb8 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java @@ -118,9 +118,9 @@ public interface AudioRendererEventListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error. Hence applications should not * implement this method to display a user visible error or initiate an application level retry. - * {@link Player.EventListener#onPlayerError} is the appropriate place to implement such behavior. - * This method is called to provide the application with an opportunity to log the error if it - * wishes to do so. + * {@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior. This + * method is called to provide the application with an opportunity to log the error if it wishes + * to do so. * * @param audioCodecError The error. Typically a {@link CodecException} if the renderer uses * {@link MediaCodec}, or a {@link DecoderException} if the renderer uses a software decoder. @@ -136,9 +136,9 @@ public interface AudioRendererEventListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error. Hence applications should not * implement this method to display a user visible error or initiate an application level retry. - * {@link Player.EventListener#onPlayerError} is the appropriate place to implement such behavior. - * This method is called to provide the application with an opportunity to log the error if it - * wishes to do so. + * {@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior. This + * method is called to provide the application with an opportunity to log the error if it wishes + * to do so. * * @param audioSinkError The error that occurred. Typically an {@link * AudioSink.InitializationException}, a {@link AudioSink.WriteException}, or an {@link diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java index 5cd82577df..6df52551c3 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java @@ -117,12 +117,12 @@ public interface AudioSink { * The player may be able to recover from the error (for example by recreating the AudioTrack, * possibly with different settings) and continue. Hence applications should not * implement this method to display a user visible error or initiate an application level retry - * ({@link Player.EventListener#onPlayerError} is the appropriate place to implement such - * behavior). This method is called to provide the application with an opportunity to log the - * error if it wishes to do so. + * ({@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior). + * This method is called to provide the application with an opportunity to log the error if it + * wishes to do so. * *

Fatal errors that cannot be recovered will be reported wrapped in a {@link - * ExoPlaybackException} by {@link Player.EventListener#onPlayerError(ExoPlaybackException)}. + * ExoPlaybackException} by {@link Player.Listener#onPlayerError(ExoPlaybackException)}. * * @param audioSinkError The error that occurred. Typically an {@link InitializationException}, * a {@link WriteException}, or an {@link UnexpectedDiscontinuityException}. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionEventListener.java index d0c6dea4fd..98a5c2db3f 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionEventListener.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionEventListener.java @@ -56,8 +56,8 @@ public interface DrmSessionEventListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error and continue. Hence applications should * not implement this method to display a user visible error or initiate an application - * level retry ({@link Player.EventListener#onPlayerError} is the appropriate place to implement - * such behavior). This method is called to provide the application with an opportunity to log the + * level retry ({@link Player.Listener#onPlayerError} is the appropriate place to implement such + * behavior). This method is called to provide the application with an opportunity to log the * error if it wishes to do so. * * @param windowIndex The window index in the timeline this media period belongs to. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java index 202fd99fc3..116f6060ad 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java @@ -141,9 +141,9 @@ public interface VideoRendererEventListener { *

This method being called does not indicate that playback has failed, or that it will fail. * The player may be able to recover from the error. Hence applications should not * implement this method to display a user visible error or initiate an application level retry. - * {@link Player.EventListener#onPlayerError} is the appropriate place to implement such behavior. - * This method is called to provide the application with an opportunity to log the error if it - * wishes to do so. + * {@link Player.Listener#onPlayerError} is the appropriate place to implement such behavior. This + * method is called to provide the application with an opportunity to log the error if it wishes + * to do so. * * @param videoCodecError The error. Typically a {@link CodecException} if the renderer uses * {@link MediaCodec}, or a {@link DecoderException} if the renderer uses a software decoder.