From 5186798db9e07221bbb2e4d72da4c4c5118e86d5 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 14 Apr 2022 20:24:00 +0100 Subject: [PATCH] Rename `Player.COMMAND_GET_TRACK_INFOS` to `COMMAND_GET_TRACKS` `Player.getCurrentTracksInfo` was renamed to `Player.getCurrentTracks` in https://github.com/androidx/media/commit/83daa052cbffe0fc671151cb8f2b0145f0b0b984. PiperOrigin-RevId: 441825078 --- .../src/main/java/androidx/media3/cast/CastPlayer.java | 2 +- .../src/main/java/androidx/media3/common/Player.java | 10 +++++----- .../java/androidx/media3/exoplayer/ExoPlayerImpl.java | 2 +- .../java/androidx/media3/exoplayer/ExoPlayerTest.java | 6 +++--- .../java/androidx/media3/session/MediaSession.java | 2 +- .../java/androidx/media3/ui/PlayerControlView.java | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java b/libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java index 1902535731..488af70f50 100644 --- a/libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java +++ b/libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java @@ -102,7 +102,7 @@ public final class CastPlayer extends BasePlayer { COMMAND_GET_MEDIA_ITEMS_METADATA, COMMAND_SET_MEDIA_ITEMS_METADATA, COMMAND_CHANGE_MEDIA_ITEMS, - COMMAND_GET_TRACK_INFOS) + COMMAND_GET_TRACKS) .build(); public static final float MIN_SPEED_SUPPORTED = 0.5f; diff --git a/libraries/common/src/main/java/androidx/media3/common/Player.java b/libraries/common/src/main/java/androidx/media3/common/Player.java index ac10b870a5..acaf8ded95 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Player.java +++ b/libraries/common/src/main/java/androidx/media3/common/Player.java @@ -381,7 +381,7 @@ public interface Player { COMMAND_SET_VIDEO_SURFACE, COMMAND_GET_TEXT, COMMAND_SET_TRACK_SELECTION_PARAMETERS, - COMMAND_GET_TRACK_INFOS, + COMMAND_GET_TRACKS, }; private final FlagSet.Builder flagsBuilder; @@ -1387,7 +1387,7 @@ public interface Player { * #COMMAND_GET_VOLUME}, {@link #COMMAND_GET_DEVICE_VOLUME}, {@link #COMMAND_SET_VOLUME}, {@link * #COMMAND_SET_DEVICE_VOLUME}, {@link #COMMAND_ADJUST_DEVICE_VOLUME}, {@link * #COMMAND_SET_VIDEO_SURFACE}, {@link #COMMAND_GET_TEXT}, {@link - * #COMMAND_SET_TRACK_SELECTION_PARAMETERS} or {@link #COMMAND_GET_TRACK_INFOS}. + * #COMMAND_SET_TRACK_SELECTION_PARAMETERS} or {@link #COMMAND_GET_TRACKS}. */ // @Target list includes both 'default' targets and TYPE_USE, to ensure backwards compatibility // with Kotlin usages from before TYPE_USE was added. @@ -1425,7 +1425,7 @@ public interface Player { COMMAND_SET_VIDEO_SURFACE, COMMAND_GET_TEXT, COMMAND_SET_TRACK_SELECTION_PARAMETERS, - COMMAND_GET_TRACK_INFOS, + COMMAND_GET_TRACKS, }) @interface Command {} /** Command to start, pause or resume playback. */ @@ -1503,8 +1503,8 @@ public interface Player { int COMMAND_GET_TEXT = 28; /** Command to set the player's track selection parameters. */ int COMMAND_SET_TRACK_SELECTION_PARAMETERS = 29; - /** Command to get track infos. */ - int COMMAND_GET_TRACK_INFOS = 30; + /** Command to get details of the current track selection. */ + int COMMAND_GET_TRACKS = 30; /** Represents an invalid {@link Command}. */ int COMMAND_INVALID = -1; diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java index fb49a90d85..541e0ccf97 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java @@ -294,7 +294,7 @@ import java.util.concurrent.TimeoutException; COMMAND_GET_MEDIA_ITEMS_METADATA, COMMAND_SET_MEDIA_ITEMS_METADATA, COMMAND_CHANGE_MEDIA_ITEMS, - COMMAND_GET_TRACK_INFOS, + COMMAND_GET_TRACKS, COMMAND_GET_AUDIO_ATTRIBUTES, COMMAND_GET_VOLUME, COMMAND_GET_DEVICE_VOLUME, diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java index f22481ae3f..8a9d13e237 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java @@ -23,7 +23,7 @@ import static androidx.media3.common.Player.COMMAND_GET_DEVICE_VOLUME; import static androidx.media3.common.Player.COMMAND_GET_MEDIA_ITEMS_METADATA; import static androidx.media3.common.Player.COMMAND_GET_TEXT; import static androidx.media3.common.Player.COMMAND_GET_TIMELINE; -import static androidx.media3.common.Player.COMMAND_GET_TRACK_INFOS; +import static androidx.media3.common.Player.COMMAND_GET_TRACKS; import static androidx.media3.common.Player.COMMAND_GET_VOLUME; import static androidx.media3.common.Player.COMMAND_PLAY_PAUSE; import static androidx.media3.common.Player.COMMAND_PREPARE; @@ -8988,7 +8988,7 @@ public final class ExoPlayerTest { assertThat(player.isCommandAvailable(COMMAND_SET_VIDEO_SURFACE)).isTrue(); assertThat(player.isCommandAvailable(COMMAND_GET_TEXT)).isTrue(); assertThat(player.isCommandAvailable(COMMAND_SET_TRACK_SELECTION_PARAMETERS)).isTrue(); - assertThat(player.isCommandAvailable(COMMAND_GET_TRACK_INFOS)).isTrue(); + assertThat(player.isCommandAvailable(COMMAND_GET_TRACKS)).isTrue(); } @Test @@ -12137,7 +12137,7 @@ public final class ExoPlayerTest { COMMAND_SET_VIDEO_SURFACE, COMMAND_GET_TEXT, COMMAND_SET_TRACK_SELECTION_PARAMETERS, - COMMAND_GET_TRACK_INFOS); + COMMAND_GET_TRACKS); if (!isTimelineEmpty) { builder.add(COMMAND_SEEK_TO_PREVIOUS); } diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaSession.java b/libraries/session/src/main/java/androidx/media3/session/MediaSession.java index b314ee3781..0cb74a5d7c 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaSession.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaSession.java @@ -852,7 +852,7 @@ public class MediaSession { * @see Player.Command#COMMAND_SET_VIDEO_SURFACE * @see Player.Command#COMMAND_GET_TEXT * @see Player.Command#COMMAND_SET_TRACK_SELECTION_PARAMETERS - * @see Player.Command#COMMAND_GET_TRACK_INFOS + * @see Player.Command#COMMAND_GET_TRACKS */ default @SessionResult.Code int onPlayerCommandRequest( MediaSession session, ControllerInfo controller, @Player.Command int playerCommand) { diff --git a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java index e24ca1fcd6..c0a64ff735 100644 --- a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java +++ b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java @@ -1096,7 +1096,7 @@ public class PlayerControlView extends FrameLayout { textTrackSelectionAdapter.clear(); audioTrackSelectionAdapter.clear(); if (player == null - || !player.isCommandAvailable(Player.COMMAND_GET_TRACK_INFOS) + || !player.isCommandAvailable(Player.COMMAND_GET_TRACKS) || !player.isCommandAvailable(Player.COMMAND_SET_TRACK_SELECTION_PARAMETERS)) { return; }