feat(playlist): remove MediaSource range

library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java

@@ -50,10 +50,11 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
  private static final int MSG_ADD = 0;
  private static final int MSG_ADD_MULTIPLE = 1;
  private static final int MSG_REMOVE = 2;
- private static final int MSG_MOVE = 3;
- private static final int MSG_CLEAR = 4;
- private static final int MSG_NOTIFY_LISTENER = 5;
- private static final int MSG_ON_COMPLETION = 6;
+ private static final int MSG_REMOVE_RANGE = 3;
+ private static final int MSG_MOVE = 4;
+ private static final int MSG_CLEAR = 5;
+ private static final int MSG_NOTIFY_LISTENER = 6;
+ private static final int MSG_ON_COMPLETION = 7;
 
  // Accessed on the app thread.
  private final List<MediaSourceHolder> mediaSourcesPublic;
@@ -265,6 +266,9 @@ public final synchronized void addMediaSources(
  * <p>Note: If you want to move the instance, it's preferable to use {@link #moveMediaSource(int,
  * int)} instead.
  *
+ * <p>Note: If you want to remove a set of contiguous sources, it's preferable to use
+ * {@link #removeMediaSourceRange(int, int)} instead.
+ *
  * @param index The index at which the media source will be removed. This index must be in the
  * range of 0 &lt;= index &lt; {@link #getSize()}.
  */
@@ -276,7 +280,10 @@ public final synchronized void removeMediaSource(int index) {
  * Removes a {@link MediaSource} from the playlist and executes a custom action on completion.
  *
  * <p>Note: If you want to move the instance, it's preferable to use {@link #moveMediaSource(int,
- * int)} instead.
+ * int, Runnable)} instead.
+ *
+ * <p>Note: If you want to remove a set of contiguous sources, it's preferable to use
+ * {@link #removeMediaSourceRange(int, int, Runnable)} instead.
  *
  * @param index The index at which the media source will be removed. This index must be in the
  * range of 0 &lt;= index &lt; {@link #getSize()}.
@@ -297,6 +304,60 @@ public final synchronized void removeMediaSource(
  }
  }
 
+ /**
+ * Removes a range of {@link MediaSource}s from the playlist, by specifying an initial index
+ * (included) and a final index (excluded).
+ *
+ * <p>Note: when specified range is empty, no actual media source is removed and no exception
+ * is thrown.
+ *
+ * @param fromIndex The initial range index, pointing to the first media source that will be
+ * removed. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
+ * @param toIndex The final range index, pointing to the first media source that will be left
+ * untouched. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
+ * @throws IndexOutOfBoundsException When the range is malformed, i.e. {@code fromIndex} &lt;
+ * 0, {@code toIndex} &gt; {@link #getSize()}, {@code fromIndex} &gt; {@code toIndex}
+ */
+ public final synchronized void removeMediaSourceRange(int fromIndex, int toIndex) {
+ removeMediaSourceRange(fromIndex, toIndex, null);
+ }
+
+ /**
+ * Removes a range of {@link MediaSource}s from the playlist, by specifying an initial index
+ * (included) and a final index (excluded), and executes a custom action on completion.
+ *
+ * <p>Note: when specified range is empty, no actual media source is removed and no exception
+ * is thrown.
+ *
+ * @param fromIndex The initial range index, pointing to the first media source that will be
+ * removed. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
+ * @param toIndex The final range index, pointing to the first media source that will be left
+ * untouched. This index must be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
+ * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+ * source range has been removed from the playlist.
+ * @throws IndexOutOfBoundsException When the range is malformed, i.e. {@code fromIndex} &lt;
+ * 0, {@code toIndex} &gt; {@link #getSize()}, {@code fromIndex} &gt; {@code toIndex}
+ */
+ public final synchronized void removeMediaSourceRange(
+ int fromIndex, int toIndex, @Nullable Runnable actionOnCompletion) {
+ Util.removeRange(mediaSourcesPublic, fromIndex, toIndex);
+ if (fromIndex == toIndex) {
+ if (actionOnCompletion != null) {
+ actionOnCompletion.run();
+ }
+ return;
+ }
+ if (player != null) {
+ player
+ .createMessage(this)
+ .setType(MSG_REMOVE_RANGE)
+ .setPayload(new MessageData<>(fromIndex, toIndex, actionOnCompletion))
+ .send();
+ } else if (actionOnCompletion != null) {
+ actionOnCompletion.run();
+ }
+ }
+
  /**
  * Moves an existing {@link MediaSource} within the playlist.
  *
@@ -489,6 +550,18 @@ public final void handleMessage(int messageType, Object message) throws ExoPlayb
  removeMediaSourceInternal(removeMessage.index);
  scheduleListenerNotification(removeMessage.actionOnCompletion);
  break;
+ case MSG_REMOVE_RANGE:
+ MessageData<Integer> removeRangeMessage = (MessageData<Integer>) message;
+ int fromIndex = removeRangeMessage.index;
+ int toIndex = removeRangeMessage.customData;
+ for (int index = toIndex - 1; index >= fromIndex; index--) {
+ shuffleOrder = shuffleOrder.cloneAndRemove(index);
+ }
+ for (int index = toIndex - 1; index >= fromIndex; index--) {
+ removeMediaSourceInternal(index);
+ }
+ scheduleListenerNotification(removeRangeMessage.actionOnCompletion);
+ break;
  case MSG_MOVE:
  MessageData<Integer> moveMessage = (MessageData<Integer>) message;
  shuffleOrder = shuffleOrder.cloneAndRemove(moveMessage.index);