更改播放器为media_kit

lib/features/player/core/abs_audio_handler.dart

@@ -1,10 +1,48 @@
 import 'package:audio_service/audio_service.dart';
-import 'package:just_audio/just_audio.dart';
+import 'package:media_kit/media_kit.dart';
 
 class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
-  final AudioPlayer player;
+  final Player player = Player();
 
-  AbsAudioHandler(this.player);
+  AbsAudioHandler() {
+    // 1. 转发播放/暂停状态
+    player.stream.playing.listen((bool playing) {
+      playbackState.add(playbackState.value.copyWith(
+        playing: playing,
+        // 根据 playing 和实际情况更新 processingState
+        processingState:
+            playing ? AudioProcessingState.ready : AudioProcessingState.idle,
+      ));
+    });
+    // 2. 转发播放位置
+    player.stream.position.listen((Duration position) {
+      playbackState.add(playbackState.value.copyWith(
+        updatePosition: position,
+      ));
+    });
+    // 3. 转发媒体总时长
+    player.stream.duration.listen((Duration? duration) {
+      // 当有新的媒体加载时，更新 mediaItem 的 duration
+      final currentItem = mediaItem.value;
+      if (currentItem != null && duration != null) {
+        mediaItem.add(currentItem.copyWith(duration: duration));
+      }
+    });
+    player.stream.completed.listen((bool playing) {
+      print('播放完成');
+    });
+  }
+
+  Future<void> playOrPause() async {
+    await player.playOrPause();
+  }
+
+  Future<void> setMediaItem(MediaItem mediaItem) async {
+    this.mediaItem.add(mediaItem);
+    await player.open(Media(mediaItem.id), play: false);
+    // ignore: unnecessary_null_comparison
+    await player.stream.duration.firstWhere((d) => d != null);
+  }
 
   // 播放控制方法重写
   @override
@@ -19,12 +57,12 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
 
   @override
   Future<void> skipToNext() async {
-    await player.seekToNext();
+    await player.next();
   }
 
   @override
   Future<void> skipToPrevious() async {
-    await player.seekToPrevious();
+    await player.previous();
   }
 
   @override
@@ -34,6 +72,10 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
 
   @override
   Future<void> setSpeed(double speed) async {
-    await player.setSpeed(speed);
+    await player.setRate(speed);
+  }
+
+  Future<void> setVolume(double volume) async {
+    await player.setVolume(volume);
   }
 }

lib/features/player/core/abs_audio_player.dart

@@ -1,5 +1,29 @@
 // ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'package:just_audio/just_audio.dart';
-import 'package:shelfsdk/audiobookshelf_api.dart';
+// import 'package:just_audio/just_audio.dart';
+import 'package:shelfsdk/audiobookshelf_api.dart' as api;
 
-class AbsAudioPlayer extends AudioPlayer {}
+class AbsPlayerState {
+  api.BookExpanded? book;
+  // 当前章节
+  final api.BookChapter? currentChapter;
+  // 当前音轨序号
+  final int currentIndex;
+
+  AbsPlayerState({
+    this.book,
+    this.currentChapter,
+    this.currentIndex = 0,
+  });
+
+  AbsPlayerState copyWith({
+    api.BookExpanded? book,
+    api.BookChapter? currentChapter,
+    int? currentIndex,
+  }) {
+    return AbsPlayerState(
+      book: book ?? this.book,
+      currentChapter: currentChapter ?? this.currentChapter,
+      currentIndex: currentIndex ?? this.currentIndex,
+    );
+  }
+}

lib/features/player/core/init.dart

@@ -0,0 +1,30 @@
+import 'package:audio_service/audio_service.dart';
+import 'package:audio_session/audio_session.dart';
+import 'package:media_kit/media_kit.dart';
+import 'package:vaani/features/player/core/abs_audio_handler.dart' as core;
+
+Future<core.AbsAudioHandler> absAudioHandlerInit() async {
+  // for playing audio on windows, linux
+  MediaKit.ensureInitialized();
+  // for configuring how this app will interact with other audio apps
+  final session = await AudioSession.instance;
+  await session.configure(const AudioSessionConfiguration.speech());
+
+  final audioService = await AudioService.init(
+    builder: () => core.AbsAudioHandler(),
+    config: const AudioServiceConfig(
+      androidNotificationChannelId: 'dr.blank.vaani.channel.audio',
+      androidNotificationChannelName: 'ABSPlayback',
+      androidNotificationChannelDescription:
+          'Needed to control audio from lock screen',
+      androidNotificationOngoing: false,
+      androidStopForegroundOnPause: false,
+      androidNotificationIcon: 'drawable/ic_stat_logo',
+      preloadArtwork: true,
+      // fastForwardInterval: Duration(seconds: 20),
+      // rewindInterval: Duration(seconds: 20),
+    ),
+  );
+
+  return audioService;
+}

lib/features/player/providers/abs_provider.dart

@@ -1,30 +1,36 @@
 import 'package:audio_service/audio_service.dart';
 import 'package:audio_session/audio_session.dart';
+import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:just_audio_media_kit/just_audio_media_kit.dart';
 import 'package:logging/logging.dart';
+import 'package:media_kit/media_kit.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:shelfsdk/audiobookshelf_api.dart';
+import 'package:shelfsdk/audiobookshelf_api.dart' as api;
+import 'package:vaani/api/api_provider.dart';
+import 'package:vaani/api/library_item_provider.dart';
+import 'package:vaani/features/downloads/providers/download_manager.dart';
+import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
 import 'package:vaani/features/player/core/abs_audio_handler.dart' as core;
 import 'package:vaani/features/player/core/abs_audio_player.dart' as core;
+import 'package:vaani/features/player/core/audiobook_player.dart';
+import 'package:vaani/features/settings/app_settings_provider.dart';
+import 'package:vaani/globals.dart';
+import 'package:vaani/shared/extensions/chapter.dart';
 
 part 'abs_provider.g.dart';
 
 final _logger = Logger('AbsPlayerProvider');
 
 @Riverpod(keepAlive: true)
-Future<core.AbsAudioHandler> absAudioHandler(Ref ref) async {
+Future<core.AbsAudioHandler> absAudioHandlerInit(Ref ref) async {
   // for playing audio on windows, linux
-  JustAudioMediaKit.ensureInitialized();
-
+  MediaKit.ensureInitialized();
   // for configuring how this app will interact with other audio apps
   final session = await AudioSession.instance;
   await session.configure(const AudioSessionConfiguration.speech());
 
-  final player = ref.read(absAudioPlayerProvider);
-
   final audioService = await AudioService.init(
-    builder: () => core.AbsAudioHandler(player),
+    builder: () => core.AbsAudioHandler(),
     config: const AudioServiceConfig(
       androidNotificationChannelId: 'dr.blank.vaani.channel.audio',
       androidNotificationChannelName: 'ABSPlayback',
@@ -39,18 +45,130 @@ Future<core.AbsAudioHandler> absAudioHandler(Ref ref) async {
     ),
   );
 
+  _logger.finer('created simple player');
   return audioService;
 }
 
 @Riverpod(keepAlive: true)
-class AbsAudioPlayer extends _$AbsAudioPlayer {
+class AbsPlayer extends _$AbsPlayer {
   @override
-  core.AbsAudioPlayer build() {
-    final player = core.AbsAudioPlayer();
-
-    ref.onDispose(player.dispose);
-    _logger.finer('created simple player');
-
-    return player;
+  core.AbsAudioHandler build() {
+    return ref.read(absAudioHandlerInitProvider).valueOrNull!;
+  }
+}
+
+@Riverpod(keepAlive: true)
+class AbsState extends _$AbsState {
+  @override
+  core.AbsPlayerState build() {
+    return core.AbsPlayerState();
+  }
+
+  // 加载书籍
+  Future<void> load(api.BookExpanded book, Duration? currentTime) async {
+    final player = ref.read(absPlayerProvider);
+    if (state.book == book || state.book?.libraryItemId == book.libraryItemId) {
+      appLogger.info('Book was already set');
+      player.playOrPause();
+      return;
+    }
+
+    final appSettings = ref.read(appSettingsProvider);
+    final api = ref.read(authenticatedApiProvider);
+    final downloadManager = ref.read(simpleDownloadManagerProvider);
+    final libItem =
+        await ref.read(libraryItemProvider(book.libraryItemId).future);
+    final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
+
+    var bookPlayerSettings =
+        ref.read(bookSettingsProvider(book.libraryItemId)).playerSettings;
+    var appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
+
+    var configurePlayerForEveryBook =
+        appPlayerSettings.configurePlayerForEveryBook;
+    final trackToPlay = book.findTrackAtTime(currentTime ?? Duration.zero);
+    final chapterToPlay = book.findChapterAtTime(currentTime ?? Duration.zero);
+    final initialIndex = book.tracks.indexOf(trackToPlay);
+    final initialPositionInTrack =
+        currentTime != null ? currentTime - trackToPlay.startOffset : null;
+    final title = appSettings.notificationSettings.primaryTitle
+        .formatNotificationTitle(book);
+    final album = appSettings.notificationSettings.secondaryTitle
+        .formatNotificationTitle(book);
+
+    final id = _getUri(trackToPlay, downloadedUris,
+            baseUrl: api.baseUrl, token: api.token!)
+        .toString();
+    final item = MediaItem(
+      id: id,
+      title: title,
+      album: album,
+      displayTitle: title,
+      displaySubtitle: album,
+      duration: chapterToPlay.duration,
+      artUri: Uri.parse(
+        '${api.baseUrl}/api/items/${book.libraryItemId}/cover?token=${api.token!}',
+      ),
+    );
+
+    state = state.copyWith(
+      book: book,
+      currentChapter: chapterToPlay,
+      currentIndex: initialIndex,
+    );
+    player.playMediaItem(item);
+    await Future.wait([
+      player.setMediaItem(item),
+      // player.setVolume(
+      //   configurePlayerForEveryBook
+      //       ? bookPlayerSettings.preferredDefaultVolume ??
+      //           appPlayerSettings.preferredDefaultVolume
+      //       : appPlayerSettings.preferredDefaultVolume,
+      // ),
+      player.setSpeed(
+        configurePlayerForEveryBook
+            ? bookPlayerSettings.preferredDefaultSpeed ??
+                appPlayerSettings.preferredDefaultSpeed
+            : appPlayerSettings.preferredDefaultSpeed,
+      ),
+      player.play(),
+    ]);
+
+    // player.setSourceAudiobook(
+    //   book,
+    //   baseUrl: api.baseUrl,
+    //   token: api.token!,
+    //   initialPosition: currentTime,
+    //   downloadedUris: downloadedUris,
+    //   volume: configurePlayerForEveryBook
+    //       ? bookPlayerSettings.preferredDefaultVolume ??
+    //           appPlayerSettings.preferredDefaultVolume
+    //       : appPlayerSettings.preferredDefaultVolume,
+    //   speed: configurePlayerForEveryBook
+    //       ? bookPlayerSettings.preferredDefaultSpeed ??
+    //           appPlayerSettings.preferredDefaultSpeed
+    //       : appPlayerSettings.preferredDefaultSpeed,
+    // );
+  }
+
+  Future<void> next() async {}
+
+  Future<void> previous() async {}
+
+  Uri _getUri(
+    api.AudioTrack track,
+    List<Uri>? downloadedUris, {
+    required Uri baseUrl,
+    required String token,
+  }) {
+    // check if the track is in the downloadedUris
+    final uri = downloadedUris?.firstWhereOrNull(
+      (element) {
+        return element.pathSegments.last == track.metadata?.filename;
+      },
+    );
+
+    return uri ??
+        Uri.parse('${baseUrl.toString()}${track.contentUrl}?token=$token');
   }
 }

lib/features/player/providers/abs_provider.g.dart

@@ -6,38 +6,54 @@ part of 'abs_provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$absAudioHandlerHash() => r'f4ef20cc3e244d5d37354ef38a1e0fdbd89412f4';
+String _$absAudioHandlerInitHash() =>
+    r'8815383b114e5e3da826afdea58bf0a884b1e3f2';
 
-/// See also [absAudioHandler].
-@ProviderFor(absAudioHandler)
-final absAudioHandlerProvider = FutureProvider<core.AbsAudioHandler>.internal(
-  absAudioHandler,
-  name: r'absAudioHandlerProvider',
+/// See also [absAudioHandlerInit].
+@ProviderFor(absAudioHandlerInit)
+final absAudioHandlerInitProvider =
+    FutureProvider<core.AbsAudioHandler>.internal(
+  absAudioHandlerInit,
+  name: r'absAudioHandlerInitProvider',
   debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
       ? null
-      : _$absAudioHandlerHash,
+      : _$absAudioHandlerInitHash,
   dependencies: null,
   allTransitiveDependencies: null,
 );
 
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
-typedef AbsAudioHandlerRef = FutureProviderRef<core.AbsAudioHandler>;
-String _$absAudioPlayerHash() => r'68a56d45a9f165d257c23f81d9bf7d0930425464';
+typedef AbsAudioHandlerInitRef = FutureProviderRef<core.AbsAudioHandler>;
+String _$absPlayerHash() => r'c313a2456bb221b83f3cd2142ae63d6463ef304b';
 
-/// See also [AbsAudioPlayer].
-@ProviderFor(AbsAudioPlayer)
-final absAudioPlayerProvider =
-    NotifierProvider<AbsAudioPlayer, core.AbsAudioPlayer>.internal(
-  AbsAudioPlayer.new,
-  name: r'absAudioPlayerProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$absAudioPlayerHash,
+/// See also [AbsPlayer].
+@ProviderFor(AbsPlayer)
+final absPlayerProvider =
+    NotifierProvider<AbsPlayer, core.AbsAudioHandler>.internal(
+  AbsPlayer.new,
+  name: r'absPlayerProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$absPlayerHash,
   dependencies: null,
   allTransitiveDependencies: null,
 );
 
-typedef _$AbsAudioPlayer = Notifier<core.AbsAudioPlayer>;
+typedef _$AbsPlayer = Notifier<core.AbsAudioHandler>;
+String _$absStateHash() => r'fb11d9d970e0de2dfd722c1f0de2a3b9b10f2859';
+
+/// See also [AbsState].
+@ProviderFor(AbsState)
+final absStateProvider =
+    NotifierProvider<AbsState, core.AbsPlayerState>.internal(
+  AbsState.new,
+  name: r'absStateProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$absStateHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$AbsState = Notifier<core.AbsPlayerState>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/features/player/providers/audiobook_player.dart

@@ -1,6 +1,6 @@
 import 'package:audio_service/audio_service.dart';
 import 'package:audio_session/audio_session.dart';
-import 'package:just_audio_media_kit/just_audio_media_kit.dart';
+// import 'package:just_audio_media_kit/just_audio_media_kit.dart';
 import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vaani/features/player/core/audiobook_player.dart';
@@ -10,7 +10,7 @@ part 'audiobook_player.g.dart';
 @Riverpod(keepAlive: true)
 Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
   // for playing audio on windows, linux
-  JustAudioMediaKit.ensureInitialized();
+  // JustAudioMediaKit.ensureInitialized();
 
   // for configuring how this app will interact with other audio apps
   final session = await AudioSession.instance;

lib/features/player/providers/audiobook_player.g.dart

@@ -6,7 +6,7 @@ part of 'audiobook_player.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$audioHandlerInitHash() => r'f4907b614d5698c1c8fe8e999edd5fde46bc29f2';
+String _$audioHandlerInitHash() => r'80f9912c0a93b4bbfe7da3967966065e78f2f6c2';
 
 /// See also [audioHandlerInit].
 @ProviderFor(audioHandlerInit)