更改播放音频方式

lib/features/player/providers/audiobook_player.dart

@@ -1,6 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:shelfsdk/audiobookshelf_api.dart' as shelfsdk;
 import 'package:vaani/api/api_provider.dart';
 import 'package:vaani/features/player/core/audiobook_player.dart' as core;
 
@@ -38,9 +39,9 @@ class AudiobookPlayer extends _$AudiobookPlayer {
     ref.onDispose(player.dispose);
 
     // bind notify listeners to the player
-    player.playerStateStream.listen((_) {
-      ref.notifyListeners();
-    });
+    // player.playerStateStream.listen((_) {
+    //   ref.notifyListeners();
+    // });
 
     _logger.finer('created player');
 
@@ -51,6 +52,13 @@ class AudiobookPlayer extends _$AudiobookPlayer {
     await state.setSpeed(speed);
     ref.notifyListeners();
   }
+
+  Future<void> setSourceAudiobook({
+    required shelfsdk.BookExpanded book,
+    shelfsdk.MediaProgress? userMediaProgress,
+  }) async {
+    ref.notifyListeners();
+  }
 }
 
 @riverpod

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

@@ -43,7 +43,7 @@ final simpleAudiobookPlayerProvider =
 );
 
 typedef _$SimpleAudiobookPlayer = Notifier<core.AudiobookPlayer>;
-String _$audiobookPlayerHash() => r'0f180308067486896fec6a65a6afb0e6686ac4a0';
+String _$audiobookPlayerHash() => r'04448247e79c5d60b9fd6f98eeeb865f1e8d0ff8';
 
 /// See also [AudiobookPlayer].
 @ProviderFor(AudiobookPlayer)

lib/features/player/providers/currently_playing_provider.dart

@@ -12,8 +12,8 @@ final _logger = Logger('CurrentlyPlayingProvider');
 @riverpod
 BookExpanded? currentlyPlayingBook(Ref ref) {
   try {
-    final player = ref.watch(audiobookPlayerProvider);
-    return player.book;
+    final book = ref.watch(simpleAudiobookPlayerProvider.select((v) => v.book));
+    return book;
   } catch (e) {
     _logger.warning('Error getting currently playing book: $e');
     return null;

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

@@ -7,7 +7,7 @@ part of 'currently_playing_provider.dart';
 // **************************************************************************
 
 String _$currentlyPlayingBookHash() =>
-    r'e4258694c8f0d1e89651b330fae0f672ca13a484';
+    r'f2c47028340d253be9440dc29f835328ff30c0e6';
 
 /// See also [currentlyPlayingBook].
 @ProviderFor(currentlyPlayingBook)

lib/features/player/providers/session_provider.dart

@@ -0,0 +1,216 @@
+import 'package:audio_service/audio_service.dart';
+import 'package:http/http.dart' as http;
+import 'package:just_audio/just_audio.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:shelfsdk/audiobookshelf_api.dart' as core;
+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/audiobook_player_session.dart';
+import 'package:vaani/globals.dart';
+import 'package:vaani/settings/app_settings_provider.dart';
+import 'package:vaani/shared/extensions/obfuscation.dart';
+
+part 'session_provider.g.dart';
+
+class SessionPlayer {
+  late final AbsAudioHandler _audioService;
+  core.PlaybackSessionExpanded? _session;
+  Ref ref;
+  SessionPlayer(this.ref);
+  void setAudioService(AbsAudioHandler audioPlayer) {
+    _audioService = audioPlayer;
+  }
+
+  Future<void> load(String id, String? episodeId) async {
+    ref.read(sessionLoadingProvider(id).notifier).setLoading();
+    final api = ref.read(authenticatedApiProvider);
+    final playBack = await api.items.play(
+      libraryItemId: id,
+      parameters: core.PlayItemReqParams(
+        deviceInfo: core.DeviceInfoReqParams(
+          clientVersion: appVersion,
+          manufacturer: deviceManufacturer,
+          model: deviceModel,
+          sdkVersion: deviceSdkVersion,
+          clientName: appName,
+          deviceName: deviceName,
+        ),
+        forceDirectPlay: false,
+        forceTranscode: false,
+        supportedMimeTypes: [
+          "audio/flac",
+          "audio/mpeg",
+          "audio/mp4",
+          "audio/ogg",
+          "audio/aac",
+          "audio/webm",
+        ],
+      ),
+      responseErrorHandler: _responseErrorHandler,
+    ) as core.PlaybackSessionExpanded;
+
+    final downloadManager = ref.read(simpleDownloadManagerProvider);
+    final libItem =
+        await ref.read(libraryItemProvider(playBack.libraryItemId).future);
+    final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
+
+    var bookPlayerSettings =
+        ref.read(bookSettingsProvider(playBack.libraryItemId)).playerSettings;
+    var appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
+
+    var configurePlayerForEveryBook =
+        appPlayerSettings.configurePlayerForEveryBook;
+
+    await Future.wait([
+      _audioService.setSourceAudiobook(
+        playBack,
+        baseUrl: api.baseUrl,
+        token: api.token!,
+        downloadedUris: downloadedUris,
+      ),
+      // set the volume
+      _audioService.setVolume(
+        configurePlayerForEveryBook
+            ? bookPlayerSettings.preferredDefaultVolume ??
+                appPlayerSettings.preferredDefaultVolume
+            : appPlayerSettings.preferredDefaultVolume,
+      ),
+      // set the speed
+      _audioService.setSpeed(
+        configurePlayerForEveryBook
+            ? bookPlayerSettings.preferredDefaultSpeed ??
+                appPlayerSettings.preferredDefaultSpeed
+            : appPlayerSettings.preferredDefaultSpeed,
+      ),
+    ]);
+    _session = playBack;
+    ref.read(sessionLoadingProvider(id).notifier).setLoaded();
+    ref.notifyListeners();
+  }
+
+  AbsAudioHandler get audioService => _audioService;
+  core.PlaybackSession? get session => _session;
+
+  void _responseErrorHandler(http.Response response, [error]) {
+    if (response.statusCode != 200) {
+      appLogger.severe('Error with api: ${response.obfuscate()}, $error');
+      throw PlaybackSyncError(
+        'Error syncing position: ${response.body}, $error',
+      );
+    }
+  }
+}
+
+@Riverpod(keepAlive: true)
+class Player extends _$Player {
+  @override
+  AbsAudioHandler build() {
+    final audioService = ref.watch(sessionProvider).audioService;
+    // audioService.positionStream.listen((position){
+
+    // });
+    return audioService;
+  }
+
+  Future<void> togglePlayPause() => state.togglePlayPause();
+  Future<void> play() => state.play();
+  Future<void> pause() => state.pause();
+  Future<void> seekInBook(Duration globalPosition) =>
+      state.seekInBook(globalPosition);
+}
+
+@Riverpod(keepAlive: true)
+SessionPlayer session(Ref ref) {
+  return SessionPlayer(ref);
+}
+
+@Riverpod(keepAlive: true)
+class SessionLoading extends _$SessionLoading {
+  @override
+  bool build(String itemId) {
+    return false;
+  }
+
+  setLoading() {
+    state = true;
+  }
+
+  setLoaded() {
+    state = false;
+  }
+}
+
+@Riverpod(keepAlive: true)
+class PlayState extends _$PlayState {
+  @override
+  PlayerState build() {
+    return PlayerState(false, ProcessingState.idle);
+  }
+
+  void setState(PlayerState playerState) {
+    state = playerState;
+  }
+}
+
+@riverpod
+core.BookChapter? currentChapter(Ref ref) {
+  return ref.watch(playerProvider.select((v) => v.currentChapter));
+}
+
+@Riverpod(keepAlive: true)
+Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
+  // JustAudioMediaKit.ensureInitialized(windows: false);
+  JustAudioMediaKit.ensureInitialized();
+  final audioService = await AudioService.init(
+    builder: () => AbsAudioHandler(ref),
+    config: const AudioServiceConfig(
+      androidNotificationChannelId: 'com.vaani.rang.channel.audio',
+      androidNotificationChannelName: 'ABSPlayback',
+      androidNotificationChannelDescription:
+          'Needed to control audio from lock screen',
+      androidNotificationOngoing: false,
+      androidStopForegroundOnPause: false,
+      androidNotificationIcon: 'drawable/ic_stat_logo',
+      preloadArtwork: true,
+    ),
+  );
+  ref.read(sessionProvider).setAudioService(audioService);
+  return audioService;
+}
+
+// @Riverpod(keepAlive: true)
+// class PlaybackReporter extends _$PlaybackReporter {
+//   @override
+//   Future<core.PlaybackReporter> build() async {
+//     final playerSettings = ref.watch(appSettingsProvider).playerSettings;
+//     final player = ref.watch(playerProvider);
+//     final session = ref.watch(sessionProvider.select((v) => v.session));
+//     final api = ref.watch(authenticatedApiProvider);
+
+//     final reporter = core.PlaybackReporter(
+//       player.player,
+//       api,
+//       reportingInterval: playerSettings.playbackReportInterval,
+//       markCompleteWhenTimeLeft: playerSettings.markCompleteWhenTimeLeft,
+//       minimumPositionForReporting: playerSettings.minimumPositionForReporting,
+//       session: session,
+//     );
+//     ref.onDispose(reporter.dispose);
+//     return reporter;
+//   }
+// }
+
+class PlaybackSyncError implements Exception {
+  String message;
+
+  PlaybackSyncError([this.message = 'Error syncing playback']);
+
+  @override
+  String toString() {
+    return 'PlaybackSyncError: $message';
+  }
+}

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

@@ -0,0 +1,253 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'session_provider.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$sessionHash() => r'ae97659a7772abaa3c97644f39af6b3f05c75faf';
+
+/// See also [session].
+@ProviderFor(session)
+final sessionProvider = Provider<SessionPlayer>.internal(
+  session,
+  name: r'sessionProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$sessionHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef SessionRef = ProviderRef<SessionPlayer>;
+String _$currentChapterHash() => r'a2f43d62f77ce48e6ca34c89700443f67dbd78fe';
+
+/// See also [currentChapter].
+@ProviderFor(currentChapter)
+final currentChapterProvider = AutoDisposeProvider<core.BookChapter?>.internal(
+  currentChapter,
+  name: r'currentChapterProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$currentChapterHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef CurrentChapterRef = AutoDisposeProviderRef<core.BookChapter?>;
+String _$audioHandlerInitHash() => r'64bc78439049068ec6de6e19af657d410bde9581';
+
+/// See also [audioHandlerInit].
+@ProviderFor(audioHandlerInit)
+final audioHandlerInitProvider = FutureProvider<AbsAudioHandler>.internal(
+  audioHandlerInit,
+  name: r'audioHandlerInitProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$audioHandlerInitHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef AudioHandlerInitRef = FutureProviderRef<AbsAudioHandler>;
+String _$playerHash() => r'41cc626fd4a3317ce7e1ffa3c5e03206a9819231';
+
+/// See also [Player].
+@ProviderFor(Player)
+final playerProvider = NotifierProvider<Player, AbsAudioHandler>.internal(
+  Player.new,
+  name: r'playerProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$playerHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$Player = Notifier<AbsAudioHandler>;
+String _$sessionLoadingHash() => r'4688469dd8ac9f38063917ede032cfe1506a63a8';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$SessionLoading extends BuildlessNotifier<bool> {
+  late final String itemId;
+
+  bool build(
+    String itemId,
+  );
+}
+
+/// See also [SessionLoading].
+@ProviderFor(SessionLoading)
+const sessionLoadingProvider = SessionLoadingFamily();
+
+/// See also [SessionLoading].
+class SessionLoadingFamily extends Family<bool> {
+  /// See also [SessionLoading].
+  const SessionLoadingFamily();
+
+  /// See also [SessionLoading].
+  SessionLoadingProvider call(
+    String itemId,
+  ) {
+    return SessionLoadingProvider(
+      itemId,
+    );
+  }
+
+  @override
+  SessionLoadingProvider getProviderOverride(
+    covariant SessionLoadingProvider provider,
+  ) {
+    return call(
+      provider.itemId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'sessionLoadingProvider';
+}
+
+/// See also [SessionLoading].
+class SessionLoadingProvider
+    extends NotifierProviderImpl<SessionLoading, bool> {
+  /// See also [SessionLoading].
+  SessionLoadingProvider(
+    String itemId,
+  ) : this._internal(
+          () => SessionLoading()..itemId = itemId,
+          from: sessionLoadingProvider,
+          name: r'sessionLoadingProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$sessionLoadingHash,
+          dependencies: SessionLoadingFamily._dependencies,
+          allTransitiveDependencies:
+              SessionLoadingFamily._allTransitiveDependencies,
+          itemId: itemId,
+        );
+
+  SessionLoadingProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.itemId,
+  }) : super.internal();
+
+  final String itemId;
+
+  @override
+  bool runNotifierBuild(
+    covariant SessionLoading notifier,
+  ) {
+    return notifier.build(
+      itemId,
+    );
+  }
+
+  @override
+  Override overrideWith(SessionLoading Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: SessionLoadingProvider._internal(
+        () => create()..itemId = itemId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        itemId: itemId,
+      ),
+    );
+  }
+
+  @override
+  NotifierProviderElement<SessionLoading, bool> createElement() {
+    return _SessionLoadingProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SessionLoadingProvider && other.itemId == itemId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, itemId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SessionLoadingRef on NotifierProviderRef<bool> {
+  /// The parameter `itemId` of this provider.
+  String get itemId;
+}
+
+class _SessionLoadingProviderElement
+    extends NotifierProviderElement<SessionLoading, bool>
+    with SessionLoadingRef {
+  _SessionLoadingProviderElement(super.provider);
+
+  @override
+  String get itemId => (origin as SessionLoadingProvider).itemId;
+}
+
+String _$playStateHash() => r'5256c4154c4254e406593035bc54d917a9a059bf';
+
+/// See also [PlayState].
+@ProviderFor(PlayState)
+final playStateProvider = NotifierProvider<PlayState, PlayerState>.internal(
+  PlayState.new,
+  name: r'playStateProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$playStateHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$PlayState = Notifier<PlayerState>;
+// 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