Skip to content

SDK / exoplayer

Go to a project
Commit 96cfd0b4 by ibaker Committed by Oliver Woodman
Options

Rename Player methods to refer to MediaItem instead of Window 

PiperOrigin-RevId: 401222863
parent 670bc2f8
Expand all
Inline Side-by-side
Showing with 142 additions and 22 deletions
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
...@@ -640,7 +640,7 @@ public final class CastPlayer extends BasePlayer { ...@@ -640,7 +640,7 @@ public final class CastPlayer extends BasePlayer {
} }
@Override @Override
public int getCurrentWindowIndex() { public int getCurrentMediaItemIndex() {
return pendingSeekWindowIndex != C.INDEX_UNSET ? pendingSeekWindowIndex : currentWindowIndex; 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; ...@@ -265,7 +265,7 @@ import com.google.android.exoplayer2.util.ListenerSet;
} }
@Override @Override
public int getCurrentWindowIndex() { public int getCurrentMediaItemIndex() {
return 0; return 0;
} }
......
library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java
...@@ -144,25 +144,37 @@ public abstract class BasePlayer implements Player { ...@@ -144,25 +144,37 @@ public abstract class BasePlayer implements Player {
@Deprecated @Deprecated
@Override @Override
public final boolean hasPrevious() { public final boolean hasPrevious() {
return hasPreviousWindow(); return hasPreviousMediaItem();
} }
@Deprecated
@Override @Override
public final boolean hasPreviousWindow() { public final boolean hasPreviousWindow() {
return getPreviousWindowIndex() != C.INDEX_UNSET; return hasPreviousMediaItem();
}
@Override
public final boolean hasPreviousMediaItem() {
return getPreviousMediaItemIndex() != C.INDEX_UNSET;
} }
@Deprecated @Deprecated
@Override @Override
public final void previous() { public final void previous() {
seekToPreviousWindow(); seekToPreviousMediaItem();
} }
@Deprecated
@Override @Override
public final void seekToPreviousWindow() { public final void seekToPreviousWindow() {
int previousWindowIndex = getPreviousWindowIndex(); seekToPreviousMediaItem();
if (previousWindowIndex != C.INDEX_UNSET) { }
seekToDefaultPosition(previousWindowIndex);
@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 { ...@@ -187,25 +199,37 @@ public abstract class BasePlayer implements Player {
@Deprecated @Deprecated
@Override @Override
public final boolean hasNext() { public final boolean hasNext() {
return hasNextWindow(); return hasNextMediaItem();
} }
@Deprecated
@Override @Override
public final boolean hasNextWindow() { public final boolean hasNextWindow() {
return getNextWindowIndex() != C.INDEX_UNSET; return hasNextMediaItem();
}
@Override
public final boolean hasNextMediaItem() {
return getNextMediaItemIndex() != C.INDEX_UNSET;
} }
@Deprecated @Deprecated
@Override @Override
public final void next() { public final void next() {
seekToNextWindow(); seekToNextMediaItem();
} }
@Deprecated
@Override @Override
public final void seekToNextWindow() { public final void seekToNextWindow() {
int nextWindowIndex = getNextWindowIndex(); seekToNextMediaItem();
if (nextWindowIndex != C.INDEX_UNSET) { }
seekToDefaultPosition(nextWindowIndex);
@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 { ...@@ -227,22 +251,40 @@ public abstract class BasePlayer implements Player {
setPlaybackParameters(getPlaybackParameters().withSpeed(speed)); setPlaybackParameters(getPlaybackParameters().withSpeed(speed));
} }
@Deprecated
@Override
public final int getCurrentWindowIndex() {
return getCurrentMediaItemIndex();
}
@Deprecated
@Override @Override
public final int getNextWindowIndex() { public final int getNextWindowIndex() {
return getNextMediaItemIndex();
}
@Override
public final int getNextMediaItemIndex() {
Timeline timeline = getCurrentTimeline(); Timeline timeline = getCurrentTimeline();
return timeline.isEmpty() return timeline.isEmpty()
? C.INDEX_UNSET ? C.INDEX_UNSET
: timeline.getNextWindowIndex( : timeline.getNextWindowIndex(
getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled()); getCurrentMediaItemIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
} }
@Deprecated
@Override @Override
public final int getPreviousWindowIndex() { public final int getPreviousWindowIndex() {
return getPreviousMediaItemIndex();
}
@Override
public final int getPreviousMediaItemIndex() {
Timeline timeline = getCurrentTimeline(); Timeline timeline = getCurrentTimeline();
return timeline.isEmpty() return timeline.isEmpty()
? C.INDEX_UNSET ? C.INDEX_UNSET
: timeline.getPreviousWindowIndex( : timeline.getPreviousWindowIndex(
getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled()); getCurrentMediaItemIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
} }
@Override @Override
...@@ -280,16 +322,28 @@ public abstract class BasePlayer implements Player { ...@@ -280,16 +322,28 @@ public abstract class BasePlayer implements Player {
: duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100); : duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100);
} }
@Deprecated
@Override @Override
public final boolean isCurrentWindowDynamic() { public final boolean isCurrentWindowDynamic() {
return isCurrentMediaItemDynamic();
}
@Override
public final boolean isCurrentMediaItemDynamic() {
Timeline timeline = getCurrentTimeline(); Timeline timeline = getCurrentTimeline();
return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isDynamic; return !timeline.isEmpty() && timeline.getWindow(getCurrentMediaItemIndex(), window).isDynamic;
} }
@Deprecated
@Override @Override
public final boolean isCurrentWindowLive() { public final boolean isCurrentWindowLive() {
return isCurrentMediaItemLive();
}
@Override
public final boolean isCurrentMediaItemLive() {
Timeline timeline = getCurrentTimeline(); Timeline timeline = getCurrentTimeline();
return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isLive(); return !timeline.isEmpty() && timeline.getWindow(getCurrentMediaItemIndex(), window).isLive();
} }
@Override @Override
...@@ -305,10 +359,16 @@ public abstract class BasePlayer implements Player { ...@@ -305,10 +359,16 @@ public abstract class BasePlayer implements Player {
return window.getCurrentUnixTimeMs() - window.windowStartTimeMs - getContentPosition(); return window.getCurrentUnixTimeMs() - window.windowStartTimeMs - getContentPosition();
} }
@Deprecated
@Override @Override
public final boolean isCurrentWindowSeekable() { public final boolean isCurrentWindowSeekable() {
return isCurrentMediaItemSeekable();
}
@Override
public final boolean isCurrentMediaItemSeekable() {
Timeline timeline = getCurrentTimeline(); Timeline timeline = getCurrentTimeline();
return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isSeekable; return !timeline.isEmpty() && timeline.getWindow(getCurrentMediaItemIndex(), window).isSeekable;
} }
@Override @Override
......
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
...@@ -266,23 +266,35 @@ public class ForwardingPlayer implements Player { ...@@ -266,23 +266,35 @@ public class ForwardingPlayer implements Player {
return player.hasPrevious(); return player.hasPrevious();
} }
@Deprecated
@Override @Override
public boolean hasPreviousWindow() { public boolean hasPreviousWindow() {
return player.hasPreviousWindow(); return player.hasPreviousWindow();
} }
@Override
public boolean hasPreviousMediaItem() {
return player.hasPreviousMediaItem();
}
@Deprecated @Deprecated
@Override @Override
public void previous() { public void previous() {
player.previous(); player.previous();
} }
@Deprecated
@Override @Override
public void seekToPreviousWindow() { public void seekToPreviousWindow() {
player.seekToPreviousWindow(); player.seekToPreviousWindow();
} }
@Override @Override
public void seekToPreviousMediaItem() {
player.seekToPreviousMediaItem();
}
@Override
public void seekToPrevious() { public void seekToPrevious() {
player.seekToPrevious(); player.seekToPrevious();
} }
...@@ -298,23 +310,35 @@ public class ForwardingPlayer implements Player { ...@@ -298,23 +310,35 @@ public class ForwardingPlayer implements Player {
return player.hasNext(); return player.hasNext();
} }
@Deprecated
@Override @Override
public boolean hasNextWindow() { public boolean hasNextWindow() {
return player.hasNextWindow(); return player.hasNextWindow();
} }
@Override
public boolean hasNextMediaItem() {
return player.hasNextMediaItem();
}
@Deprecated @Deprecated
@Override @Override
public void next() { public void next() {
player.next(); player.next();
} }
@Deprecated
@Override @Override
public void seekToNextWindow() { public void seekToNextWindow() {
player.seekToNextWindow(); player.seekToNextWindow();
} }
@Override @Override
public void seekToNextMediaItem() {
player.seekToNextMediaItem();
}
@Override
public void seekToNext() { public void seekToNext() {
player.seekToNext(); player.seekToNext();
} }
...@@ -406,21 +430,39 @@ public class ForwardingPlayer implements Player { ...@@ -406,21 +430,39 @@ public class ForwardingPlayer implements Player {
return player.getCurrentPeriodIndex(); return player.getCurrentPeriodIndex();
} }
@Deprecated
@Override @Override
public int getCurrentWindowIndex() { public int getCurrentWindowIndex() {
return player.getCurrentWindowIndex(); return player.getCurrentWindowIndex();
} }
@Override @Override
public int getCurrentMediaItemIndex() {
return player.getCurrentMediaItemIndex();
}
@Deprecated
@Override
public int getNextWindowIndex() { public int getNextWindowIndex() {
return player.getNextWindowIndex(); return player.getNextWindowIndex();
} }
@Override @Override
public int getNextMediaItemIndex() {
return player.getNextMediaItemIndex();
}
@Deprecated
@Override
public int getPreviousWindowIndex() { public int getPreviousWindowIndex() {
return player.getPreviousWindowIndex(); return player.getPreviousWindowIndex();
} }
@Override
public int getPreviousMediaItemIndex() {
return player.getPreviousMediaItemIndex();
}
@Nullable @Nullable
@Override @Override
public MediaItem getCurrentMediaItem() { public MediaItem getCurrentMediaItem() {
...@@ -462,27 +504,45 @@ public class ForwardingPlayer implements Player { ...@@ -462,27 +504,45 @@ public class ForwardingPlayer implements Player {
return player.getTotalBufferedDuration(); return player.getTotalBufferedDuration();
} }
@Deprecated
@Override @Override
public boolean isCurrentWindowDynamic() { public boolean isCurrentWindowDynamic() {
return player.isCurrentWindowDynamic(); return player.isCurrentWindowDynamic();
} }
@Override @Override
public boolean isCurrentMediaItemDynamic() {
return player.isCurrentMediaItemDynamic();
}
@Deprecated
@Override
public boolean isCurrentWindowLive() { public boolean isCurrentWindowLive() {
return player.isCurrentWindowLive(); return player.isCurrentWindowLive();
} }
@Override @Override
public boolean isCurrentMediaItemLive() {
return player.isCurrentMediaItemLive();
}
@Override
public long getCurrentLiveOffset() { public long getCurrentLiveOffset() {
return player.getCurrentLiveOffset(); return player.getCurrentLiveOffset();
} }
@Deprecated
@Override @Override
public boolean isCurrentWindowSeekable() { public boolean isCurrentWindowSeekable() {
return player.isCurrentWindowSeekable(); return player.isCurrentWindowSeekable();
} }
@Override @Override
public boolean isCurrentMediaItemSeekable() {
return player.isCurrentMediaItemSeekable();
}
@Override
public boolean isPlayingAd() { public boolean isPlayingAd() {
return player.isPlayingAd(); return player.isPlayingAd();
} }
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
...@@ -843,7 +843,7 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -843,7 +843,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
@Override @Override
public int getCurrentWindowIndex() { public int getCurrentMediaItemIndex() {
int currentWindowIndex = getCurrentWindowIndexInternal(); int currentWindowIndex = getCurrentWindowIndexInternal();
return currentWindowIndex == C.INDEX_UNSET ? 0 : currentWindowIndex; 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 ...@@ -1502,7 +1502,7 @@ public class SimpleExoPlayer extends BasePlayer
} }
@Override @Override
public int getCurrentWindowIndex() { public int getCurrentMediaItemIndex() {
verifyApplicationThread(); verifyApplicationThread();
return player.getCurrentWindowIndex(); 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 { ...@@ -505,7 +505,7 @@ public class StubExoPlayer extends BasePlayer implements ExoPlayer {
} }
@Override @Override
public int getCurrentWindowIndex() { public int getCurrentMediaItemIndex() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment