Rename Player methods to refer to MediaItem instead of Window

PiperOrigin-RevId: 401222863

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java

@@ -640,7 +640,7 @@ public final class CastPlayer extends BasePlayer {
   }
 
   @Override
-  public int getCurrentWindowIndex() {
+  public int getCurrentMediaItemIndex() {
     return pendingSeekWindowIndex != C.INDEX_UNSET ? pendingSeekWindowIndex : currentWindowIndex;
   }
 

extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java

@@ -265,7 +265,7 @@ import com.google.android.exoplayer2.util.ListenerSet;
   }
 
   @Override
-  public int getCurrentWindowIndex() {
+  public int getCurrentMediaItemIndex() {
     return 0;
   }
 

library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java

@@ -144,25 +144,37 @@ public abstract class BasePlayer implements Player {
   @Deprecated
   @Override
   public final boolean hasPrevious() {
-    return hasPreviousWindow();
+    return hasPreviousMediaItem();
   }
 
+  @Deprecated
   @Override
   public final boolean hasPreviousWindow() {
-    return getPreviousWindowIndex() != C.INDEX_UNSET;
+    return hasPreviousMediaItem();
+  }
+
+  @Override
+  public final boolean hasPreviousMediaItem() {
+    return getPreviousMediaItemIndex() != C.INDEX_UNSET;
   }
 
   @Deprecated
   @Override
   public final void previous() {
-    seekToPreviousWindow();
+    seekToPreviousMediaItem();
   }
 
+  @Deprecated
   @Override
   public final void seekToPreviousWindow() {
-    int previousWindowIndex = getPreviousWindowIndex();
-    if (previousWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(previousWindowIndex);
+    seekToPreviousMediaItem();
+  }
+
+  @Override
+  public final void seekToPreviousMediaItem() {
+    int previousMediaItemIndex = getPreviousMediaItemIndex();
+    if (previousMediaItemIndex != C.INDEX_UNSET) {
+      seekToDefaultPosition(previousMediaItemIndex);
     }
   }
 
@@ -187,25 +199,37 @@ public abstract class BasePlayer implements Player {
   @Deprecated
   @Override
   public final boolean hasNext() {
-    return hasNextWindow();
+    return hasNextMediaItem();
   }
 
+  @Deprecated
   @Override
   public final boolean hasNextWindow() {
-    return getNextWindowIndex() != C.INDEX_UNSET;
+    return hasNextMediaItem();
+  }
+
+  @Override
+  public final boolean hasNextMediaItem() {
+    return getNextMediaItemIndex() != C.INDEX_UNSET;
   }
 
   @Deprecated
   @Override
   public final void next() {
-    seekToNextWindow();
+    seekToNextMediaItem();
   }
 
+  @Deprecated
   @Override
   public final void seekToNextWindow() {
-    int nextWindowIndex = getNextWindowIndex();
-    if (nextWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(nextWindowIndex);
+    seekToNextMediaItem();
+  }
+
+  @Override
+  public final void seekToNextMediaItem() {
+    int nextMediaItemIndex = getNextMediaItemIndex();
+    if (nextMediaItemIndex != C.INDEX_UNSET) {
+      seekToDefaultPosition(nextMediaItemIndex);
     }
   }
 
@@ -227,22 +251,40 @@ public abstract class BasePlayer implements Player {
     setPlaybackParameters(getPlaybackParameters().withSpeed(speed));
   }
 
+  @Deprecated
+  @Override
+  public final int getCurrentWindowIndex() {
+    return getCurrentMediaItemIndex();
+  }
+
+  @Deprecated
   @Override
   public final int getNextWindowIndex() {
+    return getNextMediaItemIndex();
+  }
+
+  @Override
+  public final int getNextMediaItemIndex() {
     Timeline timeline = getCurrentTimeline();
     return timeline.isEmpty()
         ? C.INDEX_UNSET
         : timeline.getNextWindowIndex(
-            getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
+            getCurrentMediaItemIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
   }
 
+  @Deprecated
   @Override
   public final int getPreviousWindowIndex() {
+    return getPreviousMediaItemIndex();
+  }
+
+  @Override
+  public final int getPreviousMediaItemIndex() {
     Timeline timeline = getCurrentTimeline();
     return timeline.isEmpty()
         ? C.INDEX_UNSET
         : timeline.getPreviousWindowIndex(
-            getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
+            getCurrentMediaItemIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
   }
 
   @Override
@@ -280,16 +322,28 @@ public abstract class BasePlayer implements Player {
         : duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100);
   }
 
+  @Deprecated
   @Override
   public final boolean isCurrentWindowDynamic() {
+    return isCurrentMediaItemDynamic();
+  }
+
+  @Override
+  public final boolean isCurrentMediaItemDynamic() {
     Timeline timeline = getCurrentTimeline();
-    return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isDynamic;
+    return !timeline.isEmpty() && timeline.getWindow(getCurrentMediaItemIndex(), window).isDynamic;
   }
 
+  @Deprecated
   @Override
   public final boolean isCurrentWindowLive() {
+    return isCurrentMediaItemLive();
+  }
+
+  @Override
+  public final boolean isCurrentMediaItemLive() {
     Timeline timeline = getCurrentTimeline();
-    return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isLive();
+    return !timeline.isEmpty() && timeline.getWindow(getCurrentMediaItemIndex(), window).isLive();
   }
 
   @Override
@@ -305,10 +359,16 @@ public abstract class BasePlayer implements Player {
     return window.getCurrentUnixTimeMs() - window.windowStartTimeMs - getContentPosition();
   }
 
+  @Deprecated
   @Override
   public final boolean isCurrentWindowSeekable() {
+    return isCurrentMediaItemSeekable();
+  }
+
+  @Override
+  public final boolean isCurrentMediaItemSeekable() {
     Timeline timeline = getCurrentTimeline();
-    return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isSeekable;
+    return !timeline.isEmpty() && timeline.getWindow(getCurrentMediaItemIndex(), window).isSeekable;
   }
 
   @Override

library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java

@@ -266,23 +266,35 @@ public class ForwardingPlayer implements Player {
     return player.hasPrevious();
   }
 
+  @Deprecated
   @Override
   public boolean hasPreviousWindow() {
     return player.hasPreviousWindow();
   }
 
+  @Override
+  public boolean hasPreviousMediaItem() {
+    return player.hasPreviousMediaItem();
+  }
+
   @Deprecated
   @Override
   public void previous() {
     player.previous();
   }
 
+  @Deprecated
   @Override
   public void seekToPreviousWindow() {
     player.seekToPreviousWindow();
   }
 
   @Override
+  public void seekToPreviousMediaItem() {
+    player.seekToPreviousMediaItem();
+  }
+
+  @Override
   public void seekToPrevious() {
     player.seekToPrevious();
   }
@@ -298,23 +310,35 @@ public class ForwardingPlayer implements Player {
     return player.hasNext();
   }
 
+  @Deprecated
   @Override
   public boolean hasNextWindow() {
     return player.hasNextWindow();
   }
 
+  @Override
+  public boolean hasNextMediaItem() {
+    return player.hasNextMediaItem();
+  }
+
   @Deprecated
   @Override
   public void next() {
     player.next();
   }
 
+  @Deprecated
   @Override
   public void seekToNextWindow() {
     player.seekToNextWindow();
   }
 
   @Override
+  public void seekToNextMediaItem() {
+    player.seekToNextMediaItem();
+  }
+
+  @Override
   public void seekToNext() {
     player.seekToNext();
   }
@@ -406,21 +430,39 @@ public class ForwardingPlayer implements Player {
     return player.getCurrentPeriodIndex();
   }
 
+  @Deprecated
   @Override
   public int getCurrentWindowIndex() {
     return player.getCurrentWindowIndex();
   }
 
   @Override
+  public int getCurrentMediaItemIndex() {
+    return player.getCurrentMediaItemIndex();
+  }
+
+  @Deprecated
+  @Override
   public int getNextWindowIndex() {
     return player.getNextWindowIndex();
   }
 
   @Override
+  public int getNextMediaItemIndex() {
+    return player.getNextMediaItemIndex();
+  }
+
+  @Deprecated
+  @Override
   public int getPreviousWindowIndex() {
     return player.getPreviousWindowIndex();
   }
 
+  @Override
+  public int getPreviousMediaItemIndex() {
+    return player.getPreviousMediaItemIndex();
+  }
+
   @Nullable
   @Override
   public MediaItem getCurrentMediaItem() {
@@ -462,27 +504,45 @@ public class ForwardingPlayer implements Player {
     return player.getTotalBufferedDuration();
   }
 
+  @Deprecated
   @Override
   public boolean isCurrentWindowDynamic() {
     return player.isCurrentWindowDynamic();
   }
 
   @Override
+  public boolean isCurrentMediaItemDynamic() {
+    return player.isCurrentMediaItemDynamic();
+  }
+
+  @Deprecated
+  @Override
   public boolean isCurrentWindowLive() {
     return player.isCurrentWindowLive();
   }
 
   @Override
+  public boolean isCurrentMediaItemLive() {
+    return player.isCurrentMediaItemLive();
+  }
+
+  @Override
   public long getCurrentLiveOffset() {
     return player.getCurrentLiveOffset();
   }
 
+  @Deprecated
   @Override
   public boolean isCurrentWindowSeekable() {
     return player.isCurrentWindowSeekable();
   }
 
   @Override
+  public boolean isCurrentMediaItemSeekable() {
+    return player.isCurrentMediaItemSeekable();
+  }
+
+  @Override
   public boolean isPlayingAd() {
     return player.isPlayingAd();
   }

library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java

@@ -843,7 +843,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
   }
 
   @Override
-  public int getCurrentWindowIndex() {
+  public int getCurrentMediaItemIndex() {
     int currentWindowIndex = getCurrentWindowIndexInternal();
     return currentWindowIndex == C.INDEX_UNSET ? 0 : currentWindowIndex;
   }

library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java

@@ -1502,7 +1502,7 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
-  public int getCurrentWindowIndex() {
+  public int getCurrentMediaItemIndex() {
     verifyApplicationThread();
     return player.getCurrentWindowIndex();
   }

testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java

@@ -505,7 +505,7 @@ public class StubExoPlayer extends BasePlayer implements ExoPlayer {
   }
 
   @Override
-  public int getCurrentWindowIndex() {
+  public int getCurrentMediaItemIndex() {
     throw new UnsupportedOperationException();
   }