Skip to content

Commit a1eb756

Browse files
nift4marcbaechinger
authored andcommitted
Add getter for ShuffleOrder
1 parent c14c060 commit a1eb756

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,6 +1381,15 @@ void setMediaSources(
13811381
@UnstableApi
13821382
void setShuffleOrder(ShuffleOrder shuffleOrder);
13831383

1384+
/**
1385+
* Gets the shuffle order.
1386+
*
1387+
* <p>The {@link ShuffleOrder} returned will have the same length as the current playlist ({@link
1388+
* Player#getMediaItemCount()}).
1389+
*/
1390+
@UnstableApi
1391+
ShuffleOrder getShuffleOrder();
1392+
13841393
/**
13851394
* Sets the {@linkplain PreloadConfiguration preload configuration} to configure playlist
13861395
* preloading.

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,12 @@ public void setShuffleOrder(ShuffleOrder shuffleOrder) {
787787
/* repeatCurrentMediaItem= */ false);
788788
}
789789

790+
@Override
791+
public ShuffleOrder getShuffleOrder() {
792+
verifyApplicationThread();
793+
return shuffleOrder;
794+
}
795+
790796
@Override
791797
public void setPauseAtEndOfMediaItems(boolean pauseAtEndOfMediaItems) {
792798
verifyApplicationThread();

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -941,6 +941,12 @@ public void setShuffleOrder(ShuffleOrder shuffleOrder) {
941941
player.setShuffleOrder(shuffleOrder);
942942
}
943943

944+
@Override
945+
public ShuffleOrder getShuffleOrder() {
946+
blockUntilConstructorFinished();
947+
return player.getShuffleOrder();
948+
}
949+
944950
@Override
945951
public void setPlayWhenReady(boolean playWhenReady) {
946952
blockUntilConstructorFinished();

libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,11 @@ public void setShuffleOrder(ShuffleOrder shuffleOrder) {
176176
throw new UnsupportedOperationException();
177177
}
178178

179+
@Override
180+
public ShuffleOrder getShuffleOrder() {
181+
throw new UnsupportedOperationException();
182+
}
183+
179184
@Override
180185
public void setAudioAttributes(AudioAttributes audioAttributes, boolean handleAudioFocus) {
181186
throw new UnsupportedOperationException();

0 commit comments

Comments
 (0)