Merge branch 'fix-cat-insertremove' of https://github.com/jonmarkhall…

…/just_audio into jonmarkhall-fix-cat-insertremove
ryanheise · Dec 15, 2024 · d02bd5a · d02bd5a
2 parents f116d4a + 0e48668
commit d02bd5a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/just_audio/lib/just_audio.dart b/just_audio/lib/just_audio.dart
@@ -2598,12 +2598,13 @@ class ConcatenatingAudioSource extends AudioSource {
     if (_player != null) {
       _player!._broadcastSequence();
       await audioSource._setup(_player!);
-      await (await _player!._platform).concatenatingInsertAll(
-          ConcatenatingInsertAllRequest(
-              id: _id,
-              index: index,
-              children: [audioSource._toMessage()],
-              shuffleOrder: List.of(_shuffleOrder.indices)));
+      ConcatenatingInsertAllRequest request = ConcatenatingInsertAllRequest(
+        id: _id,
+        index: index,
+        children: [audioSource._toMessage()],
+        shuffleOrder: List.of(_shuffleOrder.indices)
+      );
+      await (await _player!._platform).concatenatingInsertAll(request);
     }
   }
 
@@ -2651,12 +2652,13 @@ class ConcatenatingAudioSource extends AudioSource {
     _shuffleOrder.removeRange(index, index + 1);
     if (_player != null) {
       _player!._broadcastSequence();
-      await (await _player!._platform).concatenatingRemoveRange(
-          ConcatenatingRemoveRangeRequest(
-              id: _id,
-              startIndex: index,
-              endIndex: index + 1,
-              shuffleOrder: List.of(_shuffleOrder.indices)));
+      ConcatenatingRemoveRangeRequest request = ConcatenatingRemoveRangeRequest(
+        id: _id,
+        startIndex: index,
+        endIndex: index + 1,
+        shuffleOrder: List.of(_shuffleOrder.indices)
+      );
+      await (await _player!._platform).concatenatingRemoveRange(request);
     }
   }
 

diff --git a/just_audio_background/lib/just_audio_background.dart b/just_audio_background/lib/just_audio_background.dart
@@ -523,6 +523,8 @@ class _PlayerAudioHandler extends BaseAudioHandler
       ConcatenatingInsertAllRequest request) async {
     final cat = _source!.findCat(request.id)!;
     cat.children.insertAll(request.index, request.children);
+	  cat.shuffleOrder.clear();
+	  cat.shuffleOrder.addAll(request.shuffleOrder);
     _updateShuffleIndices();
     _broadcastStateIfActive();
     _updateQueue();
@@ -533,6 +535,8 @@ class _PlayerAudioHandler extends BaseAudioHandler
       ConcatenatingRemoveRangeRequest request) async {
     final cat = _source!.findCat(request.id)!;
     cat.children.removeRange(request.startIndex, request.endIndex);
+	  cat.shuffleOrder.clear();
+  	cat.shuffleOrder.addAll(request.shuffleOrder);
     _updateShuffleIndices();
     _broadcastStateIfActive();
     _updateQueue();