Merge ff252d6b14 into 151a440e7e

lib/provider/audio_player/audio_player.dart

@@ -147,29 +147,21 @@ class AudioPlayerNotifier extends Notifier<AudioPlayerState> {
         try {
           // Playlist and state has to be in sync. This is only meant for
           // the shuffle/re-ordering indices to be in sync
-          if (playlist.medias.length != state.tracks.length) {
+          if (playlist.medias.length != state.tracks.length) return;
-            AppLogger.log.w(
+
-              "Playlist length does not match state tracks length. Ignoring... "
+          final queries = playlist.medias
-              "Playlist length: ${playlist.medias.length}, "
+              .map((media) => TrackSourceQuery.parseUri(media.uri))
-              "State tracks length: ${state.tracks.length}",
+              .toList();
-            );
-            return;
-          }
 
           final trackGroupedById = groupBy(
             state.tracks,
             (query) => query.id,
           );
 
-          final tracks = <SpotubeTrackObject>[];
+          final tracks = queries
-
+              .map((query) => trackGroupedById[query.id]?.firstOrNull)
-          for (final media in playlist.medias) {
+              .nonNulls
-            final trackQuery = TrackSourceQuery.parseUri(media.uri);
+              .toList();
-            final track = trackGroupedById[trackQuery.id]?.firstOrNull;
-            if (track != null) {
-              tracks.add(track);
-            }
-          }
 
           if (tracks.length != state.tracks.length) {
             AppLogger.log.w("Mismatch in tracks after reordering/shuffling.");

lib/services/audio_player/audio_players_streams_mixin.dart

@@ -146,5 +146,7 @@ mixin SpotubeAudioPlayersStreams on AudioPlayerInterface {
 
   Stream<String> get errorStream => _mkPlayer.stream.error;
 
-  Stream<mk.Playlist> get playlistStream => _mkPlayer.stream.playlist;
+  Stream<mk.Playlist> get playlistStream => _mkPlayer.stream.playlist.map((s) {
+        return s;
+      });
 }

lib/services/audio_player/custom_player.dart

@@ -12,15 +12,19 @@ import 'package:spotube/utils/platform.dart';
 /// This class adds a state stream to the [Player] class.
 class CustomPlayer extends Player {
   final StreamController<AudioPlaybackState> _playerStateStream;
+  final StreamController<bool> _shuffleStream;
 
   late final List<StreamSubscription> _subscriptions;
 
+  bool _shuffled;
   int _androidAudioSessionId = 0;
   String _packageName = "";
   AndroidAudioManager? _androidAudioManager;
 
   CustomPlayer({super.configuration})
-      : _playerStateStream = StreamController.broadcast() {
+      : _playerStateStream = StreamController.broadcast(),
+        _shuffleStream = StreamController.broadcast(),
+        _shuffled = false {
     nativePlayer.setProperty("network-timeout", "120");
 
     _subscriptions = [
@@ -82,10 +86,10 @@ class CustomPlayer extends Player {
     }
   }
 
-  bool get shuffled => state.shuffle;
+  bool get shuffled => _shuffled;
 
   Stream<AudioPlaybackState> get playerStateStream => _playerStateStream.stream;
-  Stream<bool> get shuffleStream => stream.shuffle;
+  Stream<bool> get shuffleStream => _shuffleStream.stream;
   Stream<int> get indexChangeStream {
     int oldIndex = state.playlist.index;
     return stream.playlist.map((event) => event.index).where((newIndex) {
@@ -99,14 +103,22 @@ class CustomPlayer extends Player {
 
   @override
   Future<void> setShuffle(bool shuffle) async {
+    _shuffled = shuffle;
     await super.setShuffle(shuffle);
+    _shuffleStream.add(shuffle);
+    await Future.delayed(const Duration(milliseconds: 100));
+    if (shuffle) {
+      await move(state.playlist.index, 0);
+    }
   }
 
   @override
   Future<void> stop() async {
     await super.stop();
 
+    _shuffled = false;
     _playerStateStream.add(AudioPlaybackState.stopped);
+    _shuffleStream.add(false);
   }
 
   @override
@@ -122,8 +134,7 @@ class CustomPlayer extends Player {
 
   Future<void> insert(int index, Media media) async {
     await add(media);
-    await Future.delayed(const Duration(milliseconds: 100));
+    await move(state.playlist.medias.length, index);
-    await move(state.playlist.medias.length - 1, index);
   }
 
   Future<void> setAudioNormalization(bool normalize) async {

pubspec.lock

@@ -1570,65 +1570,58 @@ packages:
   media_kit:
     dependency: "direct main"
     description:
-      path: media_kit
+      name: media_kit
-      ref: HEAD
+      sha256: "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776"
-      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
+      url: "https://pub.dev"
-      url: "https://github.com/media-kit/media-kit"
+    source: hosted
-    source: git
     version: "1.2.0"
   media_kit_libs_android_audio:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "libs/android/media_kit_libs_android_audio"
+      name: media_kit_libs_android_audio
-      ref: HEAD
+      sha256: d0923d251c1232880e755b44555ce31b9e7068a29f05e01ed2fb510956bba851
-      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
+      url: "https://pub.dev"
-      url: "https://github.com/media-kit/media-kit"
+    source: hosted
-    source: git
     version: "1.3.7"
   media_kit_libs_audio:
     dependency: "direct main"
     description:
-      path: "libs/universal/media_kit_libs_audio"
+      name: media_kit_libs_audio
-      ref: HEAD
+      sha256: f5ea1eb414c4ee4994f36de36c7ce11577a249e058e907e7eb6e656513bccbfb
-      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
+      url: "https://pub.dev"
-      url: "https://github.com/media-kit/media-kit"
+    source: hosted
-    source: git
     version: "1.0.6"
   media_kit_libs_ios_audio:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "libs/ios/media_kit_libs_ios_audio"
+      name: media_kit_libs_ios_audio
-      ref: HEAD
+      sha256: "78ccf04e27d6b4ba00a355578ccb39b772f00d48269a6ac3db076edf2d51934f"
-      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
+      url: "https://pub.dev"
-      url: "https://github.com/media-kit/media-kit"
+    source: hosted
-    source: git
     version: "1.1.4"
   media_kit_libs_linux:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "libs/linux/media_kit_libs_linux"
+      name: media_kit_libs_linux
-      ref: HEAD
+      sha256: "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf"
-      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
+      url: "https://pub.dev"
-      url: "https://github.com/media-kit/media-kit"
+    source: hosted
-    source: git
     version: "1.2.1"
   media_kit_libs_macos_audio:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "libs/macos/media_kit_libs_macos_audio"
+      name: media_kit_libs_macos_audio
-      ref: HEAD
+      sha256: "3be21844df98f286de32808592835073cdef2c1a10078bac135da790badca950"
-      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
+      url: "https://pub.dev"
-      url: "https://github.com/media-kit/media-kit"
+    source: hosted
-    source: git
     version: "1.1.4"
   media_kit_libs_windows_audio:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "libs/windows/media_kit_libs_windows_audio"
+      name: media_kit_libs_windows_audio
-      ref: HEAD
+      sha256: c2fd558cc87b9d89a801141fcdffe02e338a3b21a41a18fbd63d5b221a1b8e53
-      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
+      url: "https://pub.dev"
-      url: "https://github.com/media-kit/media-kit"
+    source: hosted
-    source: git
     version: "1.0.9"
   menu_base:
     dependency: transitive

pubspec.yaml

@@ -84,14 +84,8 @@ dependencies:
   logger: ^2.0.2
   logging: ^1.3.0
   lrc: ^1.0.2
-  media_kit:
+  media_kit: ^1.1.10+1
-    git:
+  media_kit_libs_audio: ^1.0.4
-      url: https://github.com/media-kit/media-kit
-      path: media_kit
-  media_kit_libs_audio:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/universal/media_kit_libs_audio
   metadata_god: ^1.1.0
   mime: ^2.0.0
   open_file: ^3.5.10
@@ -200,26 +194,6 @@ dependency_overrides:
       ref: patch-2
       path: flutter_secure_storage_linux
   flutter_secure_storage_platform_interface: 2.0.0
-  media_kit_libs_android_audio:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/android/media_kit_libs_android_audio
-  media_kit_libs_ios_audio:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/ios/media_kit_libs_ios_audio
-  media_kit_libs_macos_audio:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/macos/media_kit_libs_macos_audio
-  media_kit_libs_windows_audio:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/windows/media_kit_libs_windows_audio
-  media_kit_libs_linux:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/linux/media_kit_libs_linux
 
 flutter:
   generate: true