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 a2f95033ae..32d6304187 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 @@ -543,14 +543,14 @@ public final class CastPlayer extends BasePlayer { } @Override - public MediaMetadata getPlaylistMediaMetadata() { + public MediaMetadata getPlaylistMetadata() { // CastPlayer does not currently support metadata. return MediaMetadata.EMPTY; } /** This method is not supported and does nothing. */ @Override - public void setPlaylistMediaMetadata(MediaMetadata mediaMetadata) { + public void setPlaylistMetadata(MediaMetadata mediaMetadata) { // CastPlayer does not currently support metadata. } 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 45e03aa009..b6d05515d9 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 @@ -349,13 +349,13 @@ public class ForwardingPlayer implements Player { } @Override - public MediaMetadata getPlaylistMediaMetadata() { - return player.getPlaylistMediaMetadata(); + public MediaMetadata getPlaylistMetadata() { + return player.getPlaylistMetadata(); } @Override - public void setPlaylistMediaMetadata(MediaMetadata mediaMetadata) { - player.setPlaylistMediaMetadata(mediaMetadata); + public void setPlaylistMetadata(MediaMetadata mediaMetadata) { + player.setPlaylistMetadata(mediaMetadata); } @Nullable @@ -624,8 +624,8 @@ public class ForwardingPlayer implements Player { } @Override - public void onPlaylistMediaMetadataChanged(MediaMetadata mediaMetadata) { - eventListener.onPlaylistMediaMetadataChanged(mediaMetadata); + public void onPlaylistMetadataChanged(MediaMetadata mediaMetadata) { + eventListener.onPlaylistMetadataChanged(mediaMetadata); } @Override diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Player.java b/library/common/src/main/java/com/google/android/exoplayer2/Player.java index 250d1bb486..4731e71972 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/Player.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/Player.java @@ -162,7 +162,7 @@ public interface Player { default void onMediaMetadataChanged(MediaMetadata mediaMetadata) {} /** Called when the playlist {@link MediaMetadata} changes. */ - default void onPlaylistMediaMetadataChanged(MediaMetadata mediaMetadata) {} + default void onPlaylistMetadataChanged(MediaMetadata mediaMetadata) {} /** * Called when the player starts or stops loading the source. @@ -1102,7 +1102,7 @@ public interface Player { EVENT_PLAYBACK_PARAMETERS_CHANGED, EVENT_AVAILABLE_COMMANDS_CHANGED, EVENT_MEDIA_METADATA_CHANGED, - EVENT_PLAYLIST_MEDIA_METADATA_CHANGED, + EVENT_PLAYLIST_METADATA_CHANGED, EVENT_FAST_FORWARD_INCREMENT_CHANGED, EVENT_REWIND_INCREMENT_CHANGED }) @@ -1142,8 +1142,8 @@ public interface Player { int EVENT_AVAILABLE_COMMANDS_CHANGED = 14; /** {@link #getMediaMetadata()} changed. */ int EVENT_MEDIA_METADATA_CHANGED = 15; - /** {@link #getPlaylistMediaMetadata()} changed. */ - int EVENT_PLAYLIST_MEDIA_METADATA_CHANGED = 16; + /** {@link #getPlaylistMetadata()} changed. */ + int EVENT_PLAYLIST_METADATA_CHANGED = 16; /** {@link #getFastForwardIncrement()} changed. */ int EVENT_FAST_FORWARD_INCREMENT_CHANGED = 17; /** {@link #getRewindIncrement()} changed. */ @@ -1803,12 +1803,12 @@ public interface Player { /** * Returns the playlist {@link MediaMetadata}, as set by {@link - * #setPlaylistMediaMetadata(MediaMetadata)}, or {@link MediaMetadata#EMPTY} if not supported. + * #setPlaylistMetadata(MediaMetadata)}, or {@link MediaMetadata#EMPTY} if not supported. */ - MediaMetadata getPlaylistMediaMetadata(); + MediaMetadata getPlaylistMetadata(); /** Sets the playlist {@link MediaMetadata}. */ - void setPlaylistMediaMetadata(MediaMetadata mediaMetadata); + void setPlaylistMetadata(MediaMetadata mediaMetadata); /** * Returns the current manifest. The type depends on the type of media being played. May be null. 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 26becd2eda..0745e8af81 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 @@ -103,7 +103,7 @@ import java.util.concurrent.CopyOnWriteArraySet; private boolean pauseAtEndOfMediaItems; private Commands availableCommands; private MediaMetadata mediaMetadata; - private MediaMetadata playlistMediaMetadata; + private MediaMetadata playlistMetadata; private long fastForwardIncrementMs; private long rewindIncrementMs; @@ -216,7 +216,7 @@ import java.util.concurrent.CopyOnWriteArraySet; .add(COMMAND_SEEK_TO_MEDIA_ITEM) .build(); mediaMetadata = MediaMetadata.EMPTY; - playlistMediaMetadata = MediaMetadata.EMPTY; + playlistMetadata = MediaMetadata.EMPTY; fastForwardIncrementMs = DEFAULT_FAST_FORWARD_INCREMENT_MS; rewindIncrementMs = DEFAULT_REWIND_INCREMENT_MS; maskingWindowIndex = C.INDEX_UNSET; @@ -1043,20 +1043,20 @@ import java.util.concurrent.CopyOnWriteArraySet; } @Override - public MediaMetadata getPlaylistMediaMetadata() { - return playlistMediaMetadata; + public MediaMetadata getPlaylistMetadata() { + return playlistMetadata; } @Override - public void setPlaylistMediaMetadata(MediaMetadata playlistMediaMetadata) { - checkNotNull(playlistMediaMetadata); - if (playlistMediaMetadata.equals(this.playlistMediaMetadata)) { + public void setPlaylistMetadata(MediaMetadata playlistMetadata) { + checkNotNull(playlistMetadata); + if (playlistMetadata.equals(this.playlistMetadata)) { return; } - this.playlistMediaMetadata = playlistMediaMetadata; + this.playlistMetadata = playlistMetadata; listeners.sendEvent( - EVENT_PLAYLIST_MEDIA_METADATA_CHANGED, - listener -> listener.onPlaylistMediaMetadataChanged(this.playlistMediaMetadata)); + EVENT_PLAYLIST_METADATA_CHANGED, + listener -> listener.onPlaylistMetadataChanged(this.playlistMetadata)); } @Override diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index 30b589829d..9b6cf5f3c6 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -1690,13 +1690,13 @@ public class SimpleExoPlayer extends BasePlayer } @Override - public MediaMetadata getPlaylistMediaMetadata() { - return player.getPlaylistMediaMetadata(); + public MediaMetadata getPlaylistMetadata() { + return player.getPlaylistMetadata(); } @Override - public void setPlaylistMediaMetadata(MediaMetadata mediaMetadata) { - player.setPlaylistMediaMetadata(mediaMetadata); + public void setPlaylistMetadata(MediaMetadata mediaMetadata) { + player.setPlaylistMetadata(mediaMetadata); } @Override diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java index 3a4f0b6c43..5dbc09eadd 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java @@ -770,12 +770,12 @@ public class AnalyticsCollector } @Override - public void onPlaylistMediaMetadataChanged(MediaMetadata playlistMediaMetadata) { + public void onPlaylistMetadataChanged(MediaMetadata playlistMetadata) { EventTime eventTime = generateCurrentPlayerMediaPeriodEventTime(); sendEvent( eventTime, - AnalyticsListener.EVENT_PLAYLIST_MEDIA_METADATA_CHANGED, - listener -> listener.onPlaylistMediaMetadataChanged(eventTime, playlistMediaMetadata)); + AnalyticsListener.EVENT_PLAYLIST_METADATA_CHANGED, + listener -> listener.onPlaylistMetadataChanged(eventTime, playlistMetadata)); } @Override 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 817050940f..612264aefe 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 @@ -171,7 +171,7 @@ public interface AnalyticsListener { EVENT_PLAYBACK_PARAMETERS_CHANGED, EVENT_AVAILABLE_COMMANDS_CHANGED, EVENT_MEDIA_METADATA_CHANGED, - EVENT_PLAYLIST_MEDIA_METADATA_CHANGED, + EVENT_PLAYLIST_METADATA_CHANGED, EVENT_FAST_FORWARD_INCREMENT_CHANGED, EVENT_REWIND_INCREMENT_CHANGED, EVENT_LOAD_STARTED, @@ -254,8 +254,8 @@ public interface AnalyticsListener { int EVENT_AVAILABLE_COMMANDS_CHANGED = Player.EVENT_AVAILABLE_COMMANDS_CHANGED; /** {@link Player#getMediaMetadata()} changed. */ int EVENT_MEDIA_METADATA_CHANGED = Player.EVENT_MEDIA_METADATA_CHANGED; - /** {@link Player#getPlaylistMediaMetadata()} changed. */ - int EVENT_PLAYLIST_MEDIA_METADATA_CHANGED = Player.EVENT_PLAYLIST_MEDIA_METADATA_CHANGED; + /** {@link Player#getPlaylistMetadata()} changed. */ + int EVENT_PLAYLIST_METADATA_CHANGED = Player.EVENT_PLAYLIST_METADATA_CHANGED; /** {@link Player#getFastForwardIncrement()} changed. */ int EVENT_FAST_FORWARD_INCREMENT_CHANGED = Player.EVENT_FAST_FORWARD_INCREMENT_CHANGED; /** {@link Player#getRewindIncrement()} changed. */ @@ -701,10 +701,9 @@ public interface AnalyticsListener { * Called when the playlist {@link MediaMetadata} changes. * * @param eventTime The event time. - * @param playlistMediaMetadata The playlist {@link MediaMetadata}. + * @param playlistMetadata The playlist {@link MediaMetadata}. */ - default void onPlaylistMediaMetadataChanged( - EventTime eventTime, MediaMetadata playlistMediaMetadata) {} + default void onPlaylistMetadataChanged(EventTime eventTime, MediaMetadata playlistMetadata) {} /** * Called when a media source started loading data. diff --git a/library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java index 76fed93286..4fb49e8b79 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java @@ -63,7 +63,7 @@ public class SimpleExoPlayerTest { } @Test - public void onPlaybackMediaMetadataChanged_calledWhenPlaybackMediaMetadataSet() { + public void onPlaylistMetadataChanged_calledWhenPlaylistMetadataSet() { SimpleExoPlayer player = new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); Player.Listener playerListener = mock(Player.Listener.class); @@ -72,10 +72,10 @@ public class SimpleExoPlayerTest { player.addAnalyticsListener(analyticsListener); MediaMetadata mediaMetadata = new MediaMetadata.Builder().setTitle("test").build(); - player.setPlaylistMediaMetadata(mediaMetadata); + player.setPlaylistMetadata(mediaMetadata); - verify(playerListener).onPlaylistMediaMetadataChanged(mediaMetadata); - verify(analyticsListener).onPlaylistMediaMetadataChanged(any(), eq(mediaMetadata)); + verify(playerListener).onPlaylistMetadataChanged(mediaMetadata); + verify(analyticsListener).onPlaylistMetadataChanged(any(), eq(mediaMetadata)); } @Test diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java index d64b57ff6f..576df4e3e0 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java @@ -391,12 +391,12 @@ public class StubExoPlayer extends BasePlayer implements ExoPlayer { } @Override - public MediaMetadata getPlaylistMediaMetadata() { + public MediaMetadata getPlaylistMetadata() { throw new UnsupportedOperationException(); } @Override - public void setPlaylistMediaMetadata(MediaMetadata mediaMetadata) { + public void setPlaylistMetadata(MediaMetadata mediaMetadata) { throw new UnsupportedOperationException(); }