Skip to content

notify ShuffleOrder when media item(s) are moved #2226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

notify ShuffleOrder when media item(s) are moved #2226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ public void moveMediaItems(int fromIndex, int toIndex, int newFromIndex) {
}
Timeline oldTimeline = getCurrentTimeline();
pendingOperationAcks++;
Util.moveItems(mediaSourceHolderSnapshots, fromIndex, toIndex, newFromIndex);
moveMediaSourceHolders(fromIndex, toIndex, newFromIndex);
Timeline newTimeline = createMaskingTimeline();
PlaybackInfo newPlaybackInfo =
maskTimelineAndPosition(
Expand All @@ -719,6 +719,11 @@ public void moveMediaItems(int fromIndex, int toIndex, int newFromIndex) {
/* repeatCurrentMediaItem= */ false);
}

private void moveMediaSourceHolders(int fromIndex, int toIndex, int newFromIndex) {
Util.moveItems(mediaSourceHolderSnapshots, fromIndex, toIndex, newFromIndex);
shuffleOrder = shuffleOrder.cloneAndMove(fromIndex, toIndex, newFromIndex);
}

@Override
public void replaceMediaItems(int fromIndex, int toIndex, List<MediaItem> mediaItems) {
verifyApplicationThread();
Expand Down
16 changes: 16 additions & 0 deletions libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ShuffleOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,22 @@ public ShuffleOrder cloneAndClear() {
*/
ShuffleOrder cloneAndInsert(int insertionIndex, int insertionCount);

/**
* Returns a copy of the shuffle order with a range of elements moved.
*
* @param indexFrom The starting index in the unshuffled order of the range to move, from before
* the move occurs.
* @param indexToExclusive The smallest index (must be greater or equal to {@code indexFrom}) that
* is not included in the range of elements moved, from before the move occurs.
* @param newIndexFrom The starting index in the unshuffled order of the range to move, from after
* the move occurs.
* @return A copy of this {@link ShuffleOrder} with the elements moved.
*/
default ShuffleOrder cloneAndMove(int indexFrom, int indexToExclusive, int newIndexFrom) {
return cloneAndRemove(indexFrom, indexToExclusive)
.cloneAndInsert(newIndexFrom, indexToExclusive - indexFrom);
}

/**
* Returns a copy of the shuffle order with a range of elements removed.
*
Expand Down