groove/Vaani
1
0
Fork 0
mirror of https://github.com/Dr-Blank/Vaani.git synced 2026-07-06 09:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

播放逻辑修改

Browse source
This commit is contained in:
rang 2025-12-08 23:46:43 +08:00
parent 420438c0df
commit 50a27fdf67
33 changed files with 788 additions and 761 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/features/item_viewer/view/library_item_actions.dart
View file

@ -15,8 +15,6 @@ import 'package:vaani/features/downloads/providers/download_manager.dart'
itemDownloadProgressProvider; itemDownloadProgressProvider;
import 'package:vaani/features/item_viewer/view/library_item_page.dart'; import 'package:vaani/features/item_viewer/view/library_item_page.dart';
import 'package:vaani/features/player/providers/abs_provider.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart';
import 'package:vaani/features/player/providers/player_status_provider.dart';
import 'package:vaani/features/settings/api_settings_provider.dart'; import 'package:vaani/features/settings/api_settings_provider.dart';
import 'package:vaani/generated/l10n.dart'; import 'package:vaani/generated/l10n.dart';
import 'package:vaani/globals.dart'; import 'package:vaani/globals.dart';
@ -435,12 +433,12 @@ class _LibraryItemPlayButton extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final currentBook = ref.watch(currentBookProvider); final currentBook = ref.watch(currentBookProvider);
final book = item.media.asBookExpanded; final book = item.media.asBookExpanded;
final playerStatusNotifier = ref.watch(playerStatusProvider); final playerStateNotifier = ref.watch(playerStateProvider.notifier);
final isLoading = playerStatusNotifier.isLoading(book.libraryItemId); final isLoading = playerStateNotifier.isLoading(book.libraryItemId);
final isCurrentBookSetInPlayer = final isCurrentBookSetInPlayer =
currentBook?.libraryItemId == book.libraryItemId; currentBook?.libraryItemId == book.libraryItemId;
final isPlayingThisBook = final isPlayingThisBook =
playerStatusNotifier.isPlaying() && isCurrentBookSetInPlayer; playerStateNotifier.isPlaying() && isCurrentBookSetInPlayer;
final userMediaProgress = item.userMediaProgress; final userMediaProgress = item.userMediaProgress;
final isBookCompleted = userMediaProgress?.isFinished ?? false; final isBookCompleted = userMediaProgress?.isFinished ?? false;
@ -469,7 +467,7 @@ class _LibraryItemPlayButton extends HookConsumerWidget {
return ElevatedButton.icon( return ElevatedButton.icon(
onPressed: () { onPressed: () {
currentBook?.libraryItemId == book.libraryItemId currentBook?.libraryItemId == book.libraryItemId
? ref.read(playerProvider).togglePlayPause() ? ref.read(absAudioPlayerProvider).playOrPause()
: ref.read(absAudioPlayerProvider.notifier).load( : ref.read(absAudioPlayerProvider.notifier).load(
book, book,
initialPosition: userMediaProgress?.currentTime, initialPosition: userMediaProgress?.currentTime,

6
lib/features/item_viewer/view/library_item_hero_section.dart
View file

@ -7,9 +7,9 @@ import 'package:vaani/api/image_provider.dart';
import 'package:vaani/api/library_item_provider.dart'; import 'package:vaani/api/library_item_provider.dart';
import 'package:vaani/constants/hero_tag_conventions.dart'; import 'package:vaani/constants/hero_tag_conventions.dart';
import 'package:vaani/features/item_viewer/view/library_item_page.dart'; import 'package:vaani/features/item_viewer/view/library_item_page.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/router/models/library_item_extras.dart';
import 'package:vaani/features/settings/app_settings_provider.dart'; import 'package:vaani/features/settings/app_settings_provider.dart';
import 'package:vaani/router/models/library_item_extras.dart';
import 'package:vaani/shared/extensions/duration_format.dart'; import 'package:vaani/shared/extensions/duration_format.dart';
import 'package:vaani/shared/extensions/model_conversions.dart'; import 'package:vaani/shared/extensions/model_conversions.dart';
import 'package:vaani/shared/widgets/shelves/book_shelf.dart'; import 'package:vaani/shared/widgets/shelves/book_shelf.dart';
@ -139,7 +139,7 @@ class _LibraryItemProgressIndicator extends HookConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final player = ref.watch(playerProvider); final player = ref.watch(absAudioPlayerProvider);
final libraryItem = ref.watch(libraryItemProvider(id)).valueOrNull; final libraryItem = ref.watch(libraryItemProvider(id)).valueOrNull;
if (libraryItem == null) { if (libraryItem == null) {
return const SizedBox.shrink(); return const SizedBox.shrink();

6
lib/features/playback_reporting/core/playback_reporter.dart
View file

@ -3,7 +3,7 @@ import 'dart:async';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:shelfsdk/audiobookshelf_api.dart'; import 'package:shelfsdk/audiobookshelf_api.dart';
import 'package:vaani/features/player/core/audiobook_player.dart'; import 'package:vaani/shared/audio_player.dart';
import 'package:vaani/shared/extensions/obfuscation.dart'; import 'package:vaani/shared/extensions/obfuscation.dart';
final _logger = Logger('PlaybackReporter'); final _logger = Logger('PlaybackReporter');
@ -14,7 +14,7 @@ final _logger = Logger('PlaybackReporter');
/// and also report when the player is paused/stopped/finished/playing /// and also report when the player is paused/stopped/finished/playing
class PlaybackReporter { class PlaybackReporter {
/// The player to watch /// The player to watch
final AbsAudioHandler player; final AbsAudioPlayer player;
/// the api to report to /// the api to report to
final AudiobookshelfApi authenticatedApi; final AudiobookshelfApi authenticatedApi;
@ -75,7 +75,7 @@ class PlaybackReporter {
this.markCompleteWhenTimeLeft = const Duration(seconds: 5), this.markCompleteWhenTimeLeft = const Duration(seconds: 5),
}) : _reportingInterval = reportingInterval { }) : _reportingInterval = reportingInterval {
// initial conditions // initial conditions
if (player.player.playing) { if (player.playing) {
_stopwatch.start(); _stopwatch.start();
_setReportTimerIfNotAlready(); _setReportTimerIfNotAlready();
_logger.fine('starting stopwatch'); _logger.fine('starting stopwatch');

4
lib/features/playback_reporting/core/playback_reporter_session.dart
View file

@ -3,7 +3,7 @@ import 'dart:async';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:shelfsdk/audiobookshelf_api.dart'; import 'package:shelfsdk/audiobookshelf_api.dart';
import 'package:vaani/features/player/core/audiobook_player.dart'; import 'package:vaani/shared/audio_player.dart';
import 'package:vaani/shared/extensions/obfuscation.dart'; import 'package:vaani/shared/extensions/obfuscation.dart';
final _logger = Logger('PlaybackReporter'); final _logger = Logger('PlaybackReporter');
@ -14,7 +14,7 @@ final _logger = Logger('PlaybackReporter');
/// and also report when the player is paused/stopped/finished/playing /// and also report when the player is paused/stopped/finished/playing
class PlaybackReporter { class PlaybackReporter {
/// The player to watch /// The player to watch
final AbsAudioHandler player; final AbsAudioPlayer player;
/// the api to report to /// the api to report to
final AudiobookshelfApi authenticatedApi; final AudiobookshelfApi authenticatedApi;

4
lib/features/playback_reporting/providers/playback_reporter_provider.dart
View file

@ -2,7 +2,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:vaani/api/api_provider.dart'; import 'package:vaani/api/api_provider.dart';
import 'package:vaani/features/playback_reporting/core/playback_reporter.dart' import 'package:vaani/features/playback_reporting/core/playback_reporter.dart'
as core; as core;
import 'package:vaani/features/player/providers/audiobook_player.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/settings/app_settings_provider.dart'; import 'package:vaani/features/settings/app_settings_provider.dart';
import 'package:vaani/globals.dart'; import 'package:vaani/globals.dart';
@ -13,7 +13,7 @@ class PlaybackReporter extends _$PlaybackReporter {
@override @override
Future<core.PlaybackReporter> build() async { Future<core.PlaybackReporter> build() async {
final playerSettings = ref.watch(appSettingsProvider).playerSettings; final playerSettings = ref.watch(appSettingsProvider).playerSettings;
final player = ref.watch(playerProvider); final player = ref.watch(absAudioPlayerProvider);
final api = ref.watch(authenticatedApiProvider); final api = ref.watch(authenticatedApiProvider);
final reporter = core.PlaybackReporter( final reporter = core.PlaybackReporter(

2
lib/features/playback_reporting/providers/playback_reporter_provider.g.dart
View file

@ -6,7 +6,7 @@ part of 'playback_reporter_provider.dart';
// RiverpodGenerator // RiverpodGenerator
// ************************************************************************** // **************************************************************************
String _$playbackReporterHash() => r'23b9770d279d921a5766fc2dda20f76dd3e181ed'; String _$playbackReporterHash() => r'13936a7d616e9055388d23fa361519b749c524a3';
/// See also [PlaybackReporter]. /// See also [PlaybackReporter].
@ProviderFor(PlaybackReporter) @ProviderFor(PlaybackReporter)

14
lib/features/player/core/abs_audio_handler.dart
View file

@ -1,8 +1,4 @@
import 'package:audio_service/audio_service.dart'; import 'package:audio_service/audio_service.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:media_kit/media_kit.dart';
import 'package:vaani/features/player/providers/abs_provider.dart'
hide AbsAudioPlayer;
import 'package:vaani/shared/audio_player.dart'; import 'package:vaani/shared/audio_player.dart';
class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler { class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
@ -39,11 +35,11 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
playing: playerState.playing, playing: playerState.playing,
// 根据 playing 和实际情况更新 processingState // 根据 playing 和实际情况更新 processingState
processingState: const { processingState: const {
ProcessingState.idle: AudioProcessingState.idle, AbsProcessingState.idle: AudioProcessingState.idle,
ProcessingState.loading: AudioProcessingState.loading, AbsProcessingState.loading: AudioProcessingState.loading,
ProcessingState.buffering: AudioProcessingState.buffering, AbsProcessingState.buffering: AudioProcessingState.buffering,
ProcessingState.ready: AudioProcessingState.ready, AbsProcessingState.ready: AudioProcessingState.ready,
ProcessingState.completed: AudioProcessingState.completed, AbsProcessingState.completed: AudioProcessingState.completed,
}[playerState.processingState] ?? }[playerState.processingState] ??
AudioProcessingState.idle, AudioProcessingState.idle,
), ),

60
lib/features/player/core/abs_audio_player.dart
View file

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

838
lib/features/player/core/audiobook_player.dart
View file

@ -1,468 +1,468 @@
// my_audio_handler.dart // // my_audio_handler.dart
import 'dart:io'; // import 'dart:io';
import 'package:audio_service/audio_service.dart'; // import 'package:audio_service/audio_service.dart';
import 'package:collection/collection.dart'; // import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart'; // import 'package:flutter/foundation.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; // import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:just_audio/just_audio.dart'; // import 'package:just_audio/just_audio.dart';
import 'package:logging/logging.dart'; // import 'package:logging/logging.dart';
import 'package:rxdart/rxdart.dart'; // import 'package:rxdart/rxdart.dart';
import 'package:shelfsdk/audiobookshelf_api.dart' hide NotificationSettings; // import 'package:shelfsdk/audiobookshelf_api.dart' hide NotificationSettings;
import 'package:vaani/features/player/core/player_status.dart' as core; // import 'package:vaani/features/player/core/player_status.dart' as core;
import 'package:vaani/features/player/providers/player_status_provider.dart'; // import 'package:vaani/features/player/providers/player_status_provider.dart';
import 'package:vaani/features/settings/app_settings_provider.dart'; // import 'package:vaani/features/settings/app_settings_provider.dart';
import 'package:vaani/features/settings/models/app_settings.dart'; // import 'package:vaani/features/settings/models/app_settings.dart';
import 'package:vaani/shared/extensions/chapter.dart'; // import 'package:vaani/shared/extensions/chapter.dart';
import 'package:vaani/shared/extensions/model_conversions.dart'; // import 'package:vaani/shared/extensions/model_conversions.dart';
// add a small offset so the display does not show the previous chapter for a split second // // add a small offset so the display does not show the previous chapter for a split second
final offset = Duration(milliseconds: 10); // final offset = Duration(milliseconds: 10);
final _logger = Logger('AudiobookPlayer'); // final _logger = Logger('AudiobookPlayer');
class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler { // class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
final AudioPlayer _player = AudioPlayer(); // final AudioPlayer _player = AudioPlayer();
final Ref ref; // final Ref ref;
BookExpanded? _book; // BookExpanded? _book;
BookExpanded? get book => _book; // BookExpanded? get book => _book;
late NotificationSettings notificationSettings; // late NotificationSettings notificationSettings;
final _currentChapterObject = BehaviorSubject<BookChapter?>.seeded(null); // final _currentChapterObject = BehaviorSubject<BookChapter?>.seeded(null);
AbsAudioHandler(this.ref) { // AbsAudioHandler(this.ref) {
notificationSettings = ref.read(appSettingsProvider).notificationSettings; // notificationSettings = ref.read(appSettingsProvider).notificationSettings;
ref.listen(appSettingsProvider, (a, b) { // ref.listen(appSettingsProvider, (a, b) {
if (a?.notificationSettings != b.notificationSettings) { // if (a?.notificationSettings != b.notificationSettings) {
notificationSettings = b.notificationSettings; // notificationSettings = b.notificationSettings;
} // }
}); // });
final statusNotifier = ref.read(playerStatusProvider.notifier); // final statusNotifier = ref.read(playerStatusProvider.notifier);
// 转发播放状态 // // 转发播放状态
_player.playbackEventStream.map(_transformEvent).pipe(playbackState); // _player.playbackEventStream.map(_transformEvent).pipe(playbackState);
_player.playerStateStream.listen((event) { // _player.playerStateStream.listen((event) {
if (event.playing) { // if (event.playing) {
statusNotifier.setPlayStatusVerify(core.PlayStatus.playing); // statusNotifier.setPlayStatusVerify(core.PlayStatus.playing);
} else { // } else {
statusNotifier.setPlayStatusVerify(core.PlayStatus.paused); // statusNotifier.setPlayStatusVerify(core.PlayStatus.paused);
} // }
}); // });
_player.positionStream.distinct().listen((position) { // _player.positionStream.distinct().listen((position) {
final chapter = _book?.findChapterAtTime(positionInBook); // final chapter = _book?.findChapterAtTime(positionInBook);
if (chapter != currentChapter) { // if (chapter != currentChapter) {
if (mediaItem.hasValue && chapter != null) { // if (mediaItem.hasValue && chapter != null) {
// updateMediaItem( // // updateMediaItem(
// mediaItem.value!.copyWith( // // mediaItem.value!.copyWith(
// duration: chapter.duration, // // duration: chapter.duration,
// displayTitle: chapter.title, // // displayTitle: chapter.title,
// ), // // ),
// ); // // );
} // }
_currentChapterObject.sink.add(chapter); // _currentChapterObject.sink.add(chapter);
} // }
}); // });
} // }
// 加载有声书 // // 加载有声书
Future<void> setSourceAudiobook( // Future<void> setSourceAudiobook(
BookExpanded book, { // BookExpanded book, {
bool preload = true, // bool preload = true,
required Uri baseUrl, // required Uri baseUrl,
required String token, // required String token,
Duration? initialPosition, // Duration? initialPosition,
List<Uri>? downloadedUris, // List<Uri>? downloadedUris,
required double volume, // required double volume,
required double speed, // required double speed,
}) async { // }) async {
final appSettings = loadOrCreateAppSettings(); // final appSettings = loadOrCreateAppSettings();
// if (book == null) { // // if (book == null) {
// _book = null; // // _book = null;
// _logger.info('Book is null, stopping player'); // // _logger.info('Book is null, stopping player');
// return stop(); // // return stop();
// } // // }
if (_book == book) { // if (_book == book) {
_logger.info('Book is the same, doing nothing'); // _logger.info('Book is the same, doing nothing');
return; // return;
} // }
_book = book; // _book = book;
final trackToPlay = book.findTrackAtTime(initialPosition ?? Duration.zero); // final trackToPlay = book.findTrackAtTime(initialPosition ?? Duration.zero);
final trackToChapter = // final trackToChapter =
book.findChapterAtTime(initialPosition ?? Duration.zero); // book.findChapterAtTime(initialPosition ?? Duration.zero);
final initialIndex = book.tracks.indexOf(trackToPlay); // final initialIndex = book.tracks.indexOf(trackToPlay);
final initialPositionInTrack = initialPosition != null // final initialPositionInTrack = initialPosition != null
? initialPosition - trackToPlay.startOffset // ? initialPosition - trackToPlay.startOffset
: null; // : null;
final title = appSettings.notificationSettings.primaryTitle // final title = appSettings.notificationSettings.primaryTitle
.formatNotificationTitle(book); // .formatNotificationTitle(book);
final album = appSettings.notificationSettings.secondaryTitle // final album = appSettings.notificationSettings.secondaryTitle
.formatNotificationTitle(book); // .formatNotificationTitle(book);
// 添加所有音轨 // // 添加所有音轨
List<AudioSource> audioSources = book.tracks // List<AudioSource> audioSources = book.tracks
.map( // .map(
(track) => AudioSource.uri( // (track) => AudioSource.uri(
_getUri(track, downloadedUris, baseUrl: baseUrl, token: token), // _getUri(track, downloadedUris, baseUrl: baseUrl, token: token),
), // ),
) // )
.toList(); // .toList();
final item = MediaItem( // final item = MediaItem(
id: book.libraryItemId, // id: book.libraryItemId,
title: title, // title: title,
album: album, // album: album,
displayTitle: title, // displayTitle: title,
displaySubtitle: album, // displaySubtitle: album,
duration: trackToChapter.duration, // duration: trackToChapter.duration,
artUri: Uri.parse( // artUri: Uri.parse(
'$baseUrl/api/items/${book.libraryItemId}/cover?token=$token', // '$baseUrl/api/items/${book.libraryItemId}/cover?token=$token',
), // ),
); // );
mediaItem.add(item); // mediaItem.add(item);
await _player // await _player
.setAudioSources( // .setAudioSources(
audioSources, // audioSources,
preload: preload, // preload: preload,
initialIndex: initialIndex, // initialIndex: initialIndex,
initialPosition: initialPositionInTrack, // initialPosition: initialPositionInTrack,
) // )
.catchError((error) { // .catchError((error) {
_logger.shout('Error in setting audio source: $error'); // _logger.shout('Error in setting audio source: $error');
return null; // return null;
}); // });
await player.seek(initialPositionInTrack, index: initialIndex); // await player.seek(initialPositionInTrack, index: initialIndex);
// _player.seek(initialPositionInTrack, index: initialIndex); // // _player.seek(initialPositionInTrack, index: initialIndex);
setVolume(volume); // setVolume(volume);
setSpeed(speed); // setSpeed(speed);
await play(); // await play();
// 恢复上次播放位置（如果有） // // 恢复上次播放位置（如果有）
// if (initialPosition != null) { // // if (initialPosition != null) {
// await seekInBook(initialPosition); // // await seekInBook(initialPosition);
// } // // }
} // }
// // 音轨切换处理 // // // 音轨切换处理
// void _onTrackChanged(int trackIndex) { // // void _onTrackChanged(int trackIndex) {
// if (_book == null) return; // // if (_book == null) return;
// // 可以在这里处理音轨切换逻辑，比如预加载下一音轨 // // // 可以在这里处理音轨切换逻辑，比如预加载下一音轨
// // print('切换到音轨: ${_book!.tracks[trackIndex].title}'); // // // print('切换到音轨: ${_book!.tracks[trackIndex].title}');
// } // // }
// 核心功能：跳转到指定章节 // // 核心功能：跳转到指定章节
Future<void> skipToChapter(int chapterId) async { // Future<void> skipToChapter(int chapterId) async {
if (_book == null) return; // if (_book == null) return;
final chapter = _book!.chapters.firstWhere( // final chapter = _book!.chapters.firstWhere(
(ch) => ch.id == chapterId, // (ch) => ch.id == chapterId,
orElse: () => throw Exception('Chapter not found'), // orElse: () => throw Exception('Chapter not found'),
); // );
await seekInBook(chapter.start + offset); // await seekInBook(chapter.start + offset);
} // }
BookExpanded? get Book => _book; // BookExpanded? get Book => _book;
// 当前音轨 // // 当前音轨
AudioTrack? get currentTrack { // AudioTrack? get currentTrack {
if (_book == null || _player.currentIndex == null) { // if (_book == null || _player.currentIndex == null) {
return null; // return null;
} // }
return _book!.tracks[_player.currentIndex!]; // return _book!.tracks[_player.currentIndex!];
} // }
// 当前章节 // // 当前章节
BookChapter? get currentChapter { // BookChapter? get currentChapter {
return _currentChapterObject.value; // return _currentChapterObject.value;
} // }
Duration get position => _player.position; // Duration get position => _player.position;
Duration get positionInChapter { // Duration get positionInChapter {
return _player.position + // return _player.position +
(currentTrack?.startOffset ?? Duration.zero) - // (currentTrack?.startOffset ?? Duration.zero) -
(currentChapter?.start ?? Duration.zero); // (currentChapter?.start ?? Duration.zero);
} // }
Duration get positionInBook { // Duration get positionInBook {
return _player.position + (currentTrack?.startOffset ?? Duration.zero); // return _player.position + (currentTrack?.startOffset ?? Duration.zero);
} // }
Duration get bufferedPositionInBook { // Duration get bufferedPositionInBook {
return _player.bufferedPosition + // return _player.bufferedPosition +
(currentTrack?.startOffset ?? Duration.zero); // (currentTrack?.startOffset ?? Duration.zero);
} // }
Duration? get chapterDuration => currentChapter?.duration; // Duration? get chapterDuration => currentChapter?.duration;
Stream<PlayerState> get playerStateStream => _player.playerStateStream; // Stream<PlayerState> get playerStateStream => _player.playerStateStream;
Stream<Duration> get positionStream => _player.positionStream; // Stream<Duration> get positionStream => _player.positionStream;
Stream<Duration> get positionStreamInBook { // Stream<Duration> get positionStreamInBook {
return _player.positionStream.map((position) { // return _player.positionStream.map((position) {
return position + (currentTrack?.startOffset ?? Duration.zero); // return position + (currentTrack?.startOffset ?? Duration.zero);
}); // });
} // }
Stream<Duration> get slowPositionStreamInBook { // Stream<Duration> get slowPositionStreamInBook {
final superPositionStream = _player.createPositionStream( // final superPositionStream = _player.createPositionStream(
steps: 100, // steps: 100,
minPeriod: const Duration(milliseconds: 500), // minPeriod: const Duration(milliseconds: 500),
maxPeriod: const Duration(seconds: 1), // maxPeriod: const Duration(seconds: 1),
); // );
return superPositionStream.map((position) { // return superPositionStream.map((position) {
return position + (currentTrack?.startOffset ?? Duration.zero); // return position + (currentTrack?.startOffset ?? Duration.zero);
}); // });
} // }
Stream<Duration> get bufferedPositionStreamInBook { // Stream<Duration> get bufferedPositionStreamInBook {
return _player.bufferedPositionStream.map((position) { // return _player.bufferedPositionStream.map((position) {
return position + (currentTrack?.startOffset ?? Duration.zero); // return position + (currentTrack?.startOffset ?? Duration.zero);
}); // });
} // }
Stream<Duration> get positionStreamInChapter { // Stream<Duration> get positionStreamInChapter {
return _player.positionStream.distinct().map((position) { // return _player.positionStream.distinct().map((position) {
return position + // return position +
(currentTrack?.startOffset ?? Duration.zero) - // (currentTrack?.startOffset ?? Duration.zero) -
(currentChapter?.start ?? Duration.zero); // (currentChapter?.start ?? Duration.zero);
}); // });
} // }
Stream<BookChapter?> get chapterStream => _currentChapterObject.stream; // Stream<BookChapter?> get chapterStream => _currentChapterObject.stream;
Future<void> togglePlayPause() async { // Future<void> togglePlayPause() async {
// check if book is set // // check if book is set
if (_book == null) { // if (_book == null) {
_logger.warning('No book is set, not toggling play/pause'); // _logger.warning('No book is set, not toggling play/pause');
} // }
return switch (_player.playerState) { // return switch (_player.playerState) {
PlayerState(playing: var isPlaying) => isPlaying ? pause() : play(), // PlayerState(playing: var isPlaying) => isPlaying ? pause() : play(),
}; // };
} // }
// 播放控制方法 // // 播放控制方法
@override // @override
Future<void> play() async { // Future<void> play() async {
await _player.play(); // await _player.play();
} // }
@override // @override
Future<void> pause() async { // Future<void> pause() async {
await _player.pause(); // await _player.pause();
} // }
// 重写上一曲/下一曲为章节导航 // // 重写上一曲/下一曲为章节导航
@override // @override
Future<void> skipToNext() async { // Future<void> skipToNext() async {
if (_book == null) { // if (_book == null) {
// 回退到默认行为 // // 回退到默认行为
return _player.seekToNext(); // return _player.seekToNext();
} // }
final chapter = currentChapter; // final chapter = currentChapter;
if (chapter == null) { // if (chapter == null) {
// 回退到默认行为 // // 回退到默认行为
return _player.seekToNext(); // return _player.seekToNext();
} // }
final chapterIndex = _book!.chapters.indexOf(chapter); // final chapterIndex = _book!.chapters.indexOf(chapter);
if (chapterIndex < _book!.chapters.length - 1) { // if (chapterIndex < _book!.chapters.length - 1) {
// 跳到下一章 // // 跳到下一章
final nextChapter = _book!.chapters[chapterIndex + 1]; // final nextChapter = _book!.chapters[chapterIndex + 1];
await skipToChapter(nextChapter.id); // await skipToChapter(nextChapter.id);
} // }
} // }
@override // @override
Future<void> skipToPrevious() async { // Future<void> skipToPrevious() async {
final chapter = currentChapter; // final chapter = currentChapter;
if (_book == null || chapter == null) { // if (_book == null || chapter == null) {
return _player.seekToPrevious(); // return _player.seekToPrevious();
} // }
final currentIndex = _book!.chapters.indexOf(chapter); // final currentIndex = _book!.chapters.indexOf(chapter);
if (currentIndex > 0) { // if (currentIndex > 0) {
// 跳到上一章 // // 跳到上一章
final prevChapter = _book!.chapters[currentIndex - 1]; // final prevChapter = _book!.chapters[currentIndex - 1];
await skipToChapter(prevChapter.id); // await skipToChapter(prevChapter.id);
} else { // } else {
// 已经是第一章，回到开头 // // 已经是第一章，回到开头
await seekInBook(Duration.zero); // await seekInBook(Duration.zero);
} // }
} // }
@override // @override
Future<void> seek(Duration position) async { // Future<void> seek(Duration position) async {
// 这个 position 是当前音轨内的位置，我们不直接使用 // // 这个 position 是当前音轨内的位置，我们不直接使用
// 而是通过全局位置来控制 // // 而是通过全局位置来控制
final track = currentTrack; // final track = currentTrack;
Duration startOffset = Duration.zero; // Duration startOffset = Duration.zero;
if (track != null) { // if (track != null) {
startOffset = track.startOffset; // startOffset = track.startOffset;
} // }
await seekInBook(startOffset + position); // await seekInBook(startOffset + position);
} // }
Future<void> setVolume(double volume) async { // Future<void> setVolume(double volume) async {
await _player.setVolume(volume); // await _player.setVolume(volume);
} // }
@override // @override
Future<void> setSpeed(double speed) async { // Future<void> setSpeed(double speed) async {
await _player.setSpeed(speed); // await _player.setSpeed(speed);
} // }
// 核心功能：跳转到全局时间位置 // // 核心功能：跳转到全局时间位置
Future<void> seekInBook(Duration globalPosition) async { // Future<void> seekInBook(Duration globalPosition) async {
if (_book == null) return; // if (_book == null) return;
// 找到目标音轨和在音轨内的位置 // // 找到目标音轨和在音轨内的位置
final track = _book!.findTrackAtTime(globalPosition); // final track = _book!.findTrackAtTime(globalPosition);
final index = _book!.tracks.indexOf(track); // final index = _book!.tracks.indexOf(track);
Duration positionInTrack = globalPosition - track.startOffset; // Duration positionInTrack = globalPosition - track.startOffset;
if (positionInTrack < Duration.zero) { // if (positionInTrack < Duration.zero) {
positionInTrack = Duration.zero; // positionInTrack = Duration.zero;
} // }
// 切换到目标音轨具体位置 // // 切换到目标音轨具体位置
await _player.seek(positionInTrack, index: index); // await _player.seek(positionInTrack, index: index);
} // }
AudioPlayer get player => _player; // AudioPlayer get player => _player;
PlaybackState _transformEvent(PlaybackEvent event) { // PlaybackState _transformEvent(PlaybackEvent event) {
return PlaybackState( // return PlaybackState(
controls: [ // controls: [
if ((kIsWeb || !Platform.isAndroid) && // if ((kIsWeb || !Platform.isAndroid) &&
notificationSettings.mediaControls // notificationSettings.mediaControls
.contains(NotificationMediaControl.skipToPreviousChapter)) // .contains(NotificationMediaControl.skipToPreviousChapter))
MediaControl.skipToPrevious, // MediaControl.skipToPrevious,
if (notificationSettings.mediaControls // if (notificationSettings.mediaControls
.contains(NotificationMediaControl.rewind)) // .contains(NotificationMediaControl.rewind))
MediaControl.rewind, // MediaControl.rewind,
if (_player.playing) MediaControl.pause else MediaControl.play, // if (_player.playing) MediaControl.pause else MediaControl.play,
if (notificationSettings.mediaControls // if (notificationSettings.mediaControls
.contains(NotificationMediaControl.fastForward)) // .contains(NotificationMediaControl.fastForward))
MediaControl.fastForward, // MediaControl.fastForward,
if ((kIsWeb || !Platform.isAndroid) && // if ((kIsWeb || !Platform.isAndroid) &&
notificationSettings.mediaControls // notificationSettings.mediaControls
.contains(NotificationMediaControl.skipToNextChapter)) // .contains(NotificationMediaControl.skipToNextChapter))
MediaControl.skipToNext, // MediaControl.skipToNext,
if (notificationSettings.mediaControls // if (notificationSettings.mediaControls
.contains(NotificationMediaControl.stop)) // .contains(NotificationMediaControl.stop))
MediaControl.stop, // MediaControl.stop,
], // ],
systemActions: { // systemActions: {
// if (kIsWeb || !Platform.isAndroid) MediaAction.skipToPrevious, // // if (kIsWeb || !Platform.isAndroid) MediaAction.skipToPrevious,
// MediaAction.rewind, // // MediaAction.rewind,
MediaAction.seek, // MediaAction.seek,
MediaAction.seekForward, // MediaAction.seekForward,
MediaAction.seekBackward, // MediaAction.seekBackward,
// MediaAction.fastForward, // // MediaAction.fastForward,
// MediaAction.stop, // // MediaAction.stop,
// MediaAction.setSpeed, // // MediaAction.setSpeed,
// if (kIsWeb || !Platform.isAndroid) MediaAction.skipToNext, // // if (kIsWeb || !Platform.isAndroid) MediaAction.skipToNext,
}, // },
androidCompactActionIndices: const [1, 2, 3], // androidCompactActionIndices: const [1, 2, 3],
processingState: const { // processingState: const {
ProcessingState.idle: AudioProcessingState.idle, // ProcessingState.idle: AudioProcessingState.idle,
ProcessingState.loading: AudioProcessingState.loading, // ProcessingState.loading: AudioProcessingState.loading,
ProcessingState.buffering: AudioProcessingState.buffering, // ProcessingState.buffering: AudioProcessingState.buffering,
ProcessingState.ready: AudioProcessingState.ready, // ProcessingState.ready: AudioProcessingState.ready,
ProcessingState.completed: AudioProcessingState.completed, // ProcessingState.completed: AudioProcessingState.completed,
}[_player.processingState] ?? // }[_player.processingState] ??
AudioProcessingState.idle, // AudioProcessingState.idle,
playing: _player.playing, // playing: _player.playing,
updatePosition: positionInChapter, // updatePosition: positionInChapter,
bufferedPosition: _player.bufferedPosition, // bufferedPosition: _player.bufferedPosition,
speed: _player.speed, // speed: _player.speed,
queueIndex: event.currentIndex, // queueIndex: event.currentIndex,
captioningEnabled: false, // captioningEnabled: false,
); // );
} // }
} // }
Uri _getUri( // Uri _getUri(
AudioTrack track, // AudioTrack track,
List<Uri>? downloadedUris, { // List<Uri>? downloadedUris, {
required Uri baseUrl, // required Uri baseUrl,
required String token, // required String token,
}) { // }) {
// check if the track is in the downloadedUris // // check if the track is in the downloadedUris
final uri = downloadedUris?.firstWhereOrNull( // final uri = downloadedUris?.firstWhereOrNull(
(element) { // (element) {
return element.pathSegments.last == track.metadata?.filename; // return element.pathSegments.last == track.metadata?.filename;
}, // },
); // );
return uri ?? // return uri ??
Uri.parse('${baseUrl.toString()}${track.contentUrl}?token=$token'); // Uri.parse('${baseUrl.toString()}${track.contentUrl}?token=$token');
} // }
extension FormatNotificationTitle on String { // extension FormatNotificationTitle on String {
String formatNotificationTitle(BookExpanded book) { // String formatNotificationTitle(BookExpanded book) {
return replaceAllMapped( // return replaceAllMapped(
RegExp(r'\$(\w+)'), // RegExp(r'\$(\w+)'),
(match) { // (match) {
final type = match.group(1); // final type = match.group(1);
return NotificationTitleType.values // return NotificationTitleType.values
.firstWhere((element) => element.name == type) // .firstWhere((element) => element.name == type)
.extractFrom(book) ?? // .extractFrom(book) ??
match.group(0) ?? // match.group(0) ??
''; // '';
}, // },
); // );
} // }
} // }
extension NotificationTitleUtils on NotificationTitleType { // extension NotificationTitleUtils on NotificationTitleType {
String? extractFrom(BookExpanded book) { // String? extractFrom(BookExpanded book) {
var bookMetadataExpanded = book.metadata.asBookMetadataExpanded; // var bookMetadataExpanded = book.metadata.asBookMetadataExpanded;
switch (this) { // switch (this) {
case NotificationTitleType.bookTitle: // case NotificationTitleType.bookTitle:
return bookMetadataExpanded.title; // return bookMetadataExpanded.title;
case NotificationTitleType.chapterTitle: // case NotificationTitleType.chapterTitle:
// TODO: implement chapter title; depends on https://github.com/Dr-Blank/Vaani/issues/2 // // TODO: implement chapter title; depends on https://github.com/Dr-Blank/Vaani/issues/2
return bookMetadataExpanded.title; // return bookMetadataExpanded.title;
case NotificationTitleType.author: // case NotificationTitleType.author:
return bookMetadataExpanded.authorName; // return bookMetadataExpanded.authorName;
case NotificationTitleType.narrator: // case NotificationTitleType.narrator:
return bookMetadataExpanded.narratorName; // return bookMetadataExpanded.narratorName;
case NotificationTitleType.series: // case NotificationTitleType.series:
return bookMetadataExpanded.seriesName; // return bookMetadataExpanded.seriesName;
case NotificationTitleType.subtitle: // case NotificationTitleType.subtitle:
return bookMetadataExpanded.subtitle; // return bookMetadataExpanded.subtitle;
case NotificationTitleType.year: // case NotificationTitleType.year:
return bookMetadataExpanded.publishedYear; // return bookMetadataExpanded.publishedYear;
} // }
} // }
} // }
extension BookExpandedExtension on BookExpanded { // extension BookExpandedExtension on BookExpanded {
BookChapter findChapterAtTime(Duration position) { // BookChapter findChapterAtTime(Duration position) {
return chapters.firstWhere( // return chapters.firstWhere(
(element) { // (element) {
return element.start <= position && element.end >= position + offset; // return element.start <= position && element.end >= position + offset;
}, // },
orElse: () => chapters.first, // orElse: () => chapters.first,
); // );
} // }
AudioTrack findTrackAtTime(Duration position) { // AudioTrack findTrackAtTime(Duration position) {
return tracks.firstWhere( // return tracks.firstWhere(
(element) { // (element) {
return element.startOffset <= position && // return element.startOffset <= position &&
element.startOffset + element.duration >= position + offset; // element.startOffset + element.duration >= position + offset;
}, // },
orElse: () => tracks.first, // orElse: () => tracks.first,
); // );
} // }
int findTrackIndexAtTime(Duration position) { // int findTrackIndexAtTime(Duration position) {
return tracks.indexWhere((element) { // return tracks.indexWhere((element) {
return element.startOffset <= position && // return element.startOffset <= position &&
element.startOffset + element.duration >= position + offset; // element.startOffset + element.duration >= position + offset;
}); // });
} // }
Duration getTrackStartOffset(int index) { // Duration getTrackStartOffset(int index) {
return tracks[index].startOffset; // return tracks[index].startOffset;
} // }
} // }

16
lib/features/player/providers/abs_provider.dart
View file

@ -1,5 +1,4 @@
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:logging/logging.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:shelfsdk/audiobookshelf_api.dart' as api; import 'package:shelfsdk/audiobookshelf_api.dart' as api;
import 'package:vaani/api/api_provider.dart'; import 'package:vaani/api/api_provider.dart';
@ -8,7 +7,7 @@ import 'package:vaani/shared/audio_player_mpv.dart';
part 'abs_provider.g.dart'; part 'abs_provider.g.dart';
final _logger = Logger('AbsPlayerProvider'); // final _logger = Logger('AbsPlayerProvider');
@Riverpod(keepAlive: true) @Riverpod(keepAlive: true)
class AbsAudioPlayer extends _$AbsAudioPlayer { class AbsAudioPlayer extends _$AbsAudioPlayer {
@ -40,7 +39,7 @@ class AbsAudioPlayer extends _$AbsAudioPlayer {
@riverpod @riverpod
class PlayerState extends _$PlayerState { class PlayerState extends _$PlayerState {
@override @override
core.PlayerState build() { core.AbsPlayerState build() {
final player = ref.read(absAudioPlayerProvider); final player = ref.read(absAudioPlayerProvider);
player.playerStateStream.listen((playerState) { player.playerStateStream.listen((playerState) {
if (playerState != state) { if (playerState != state) {
@ -49,6 +48,17 @@ class PlayerState extends _$PlayerState {
}); });
return player.playerState; return player.playerState;
} }
bool isLoading(String itemId) {
final player = ref.read(absAudioPlayerProvider);
return player.book?.libraryItemId == itemId &&
!state.playing &&
state.processingState == core.AbsProcessingState.loading;
}
bool isPlaying() {
return state.playing;
}
} }
@riverpod @riverpod

6
lib/features/player/providers/abs_provider.g.dart
View file

@ -74,12 +74,12 @@ final absAudioPlayerProvider =
); );
typedef _$AbsAudioPlayer = Notifier<core.AbsAudioPlayer>; typedef _$AbsAudioPlayer = Notifier<core.AbsAudioPlayer>;
String _$playerStateHash() => r'ed07c487fdad5fd0e21dfd32a274eecc470e83a4'; String _$playerStateHash() => r'6635671077b077f48dad173c4393462921de56f8';
/// See also [PlayerState]. /// See also [PlayerState].
@ProviderFor(PlayerState) @ProviderFor(PlayerState)
final playerStateProvider = final playerStateProvider =
AutoDisposeNotifierProvider<PlayerState, core.PlayerState>.internal( AutoDisposeNotifierProvider<PlayerState, core.AbsPlayerState>.internal(
PlayerState.new, PlayerState.new,
name: r'playerStateProvider', name: r'playerStateProvider',
debugGetCreateSourceHash: debugGetCreateSourceHash:
@ -88,7 +88,7 @@ final playerStateProvider =
allTransitiveDependencies: null, allTransitiveDependencies: null,
); );
typedef _$PlayerState = AutoDisposeNotifier<core.PlayerState>; typedef _$PlayerState = AutoDisposeNotifier<core.AbsPlayerState>;
String _$currentBookHash() => r'40c24ad45aab37afc32e8e8383d6abbe19b714bc'; String _$currentBookHash() => r'40c24ad45aab37afc32e8e8383d6abbe19b714bc';
/// See also [CurrentBook]. /// See also [CurrentBook].

198
lib/features/player/providers/audiobook_player.dart
View file

@ -1,108 +1,108 @@
import 'package:audio_service/audio_service.dart'; // import 'package:audio_service/audio_service.dart';
import 'package:audio_session/audio_session.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/riverpod.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; // import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:vaani/features/player/core/audiobook_player.dart'; // import 'package:vaani/features/player/core/audiobook_player.dart';
part 'audiobook_player.g.dart'; // part 'audiobook_player.g.dart';
@Riverpod(keepAlive: true)
Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
// for playing audio on windows, linux
// JustAudioMediaKit.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 = AudioService.init(
builder: () => AbsAudioHandler(ref),
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;
}
@Riverpod(keepAlive: true)
class Player extends _$Player {
@override
AbsAudioHandler build() {
return ref.watch(audioHandlerInitProvider).requireValue;
}
}
// @Riverpod(keepAlive: true) // @Riverpod(keepAlive: true)
// class Session extends _$Session { // Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
// // for playing audio on windows, linux
// // JustAudioMediaKit.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 = AudioService.init(
// builder: () => AbsAudioHandler(ref),
// 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;
// }
// @Riverpod(keepAlive: true)
// class Player extends _$Player {
// @override // @override
// core.PlaybackSessionExpanded? build() { // AbsAudioHandler build() {
// return null; // return ref.watch(audioHandlerInitProvider).requireValue;
// }
// Future<void> load(String id, String? episodeId) async {
// final audioService = ref.read(playerProvider);
// await audioService.pause();
// ref.read(playerStatusProvider.notifier).setLoading(id);
// final api = ref.read(authenticatedApiProvider);
// final playBack = await ref.watch(playBackSessionProvider(id).future);
// if (playBack == null) {
// return;
// }
// state = playBack.asExpanded;
// final downloadManager = ref.read(simpleDownloadManagerProvider);
// final libItem =
// await ref.read(libraryItemProvider(state!.libraryItemId).future);
// final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
// var bookPlayerSettings =
// ref.read(bookSettingsProvider(state!.libraryItemId)).playerSettings;
// var appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
// var configurePlayerForEveryBook =
// appPlayerSettings.configurePlayerForEveryBook;
// await Future.wait([
// audioService.setSourceAudiobook(
// state!.asExpanded,
// 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,
// ),
// ]);
// } // }
// } // }
class PlaybackSyncError implements Exception { // // @Riverpod(keepAlive: true)
String message; // // class Session extends _$Session {
// // @override
// // core.PlaybackSessionExpanded? build() {
// // return null;
// // }
PlaybackSyncError([this.message = 'Error syncing playback']); // // Future<void> load(String id, String? episodeId) async {
// // final audioService = ref.read(playerProvider);
// // await audioService.pause();
// // ref.read(playerStatusProvider.notifier).setLoading(id);
// // final api = ref.read(authenticatedApiProvider);
// // final playBack = await ref.watch(playBackSessionProvider(id).future);
// // if (playBack == null) {
// // return;
// // }
// // state = playBack.asExpanded;
// // final downloadManager = ref.read(simpleDownloadManagerProvider);
// // final libItem =
// // await ref.read(libraryItemProvider(state!.libraryItemId).future);
// // final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
@override // // var bookPlayerSettings =
String toString() { // // ref.read(bookSettingsProvider(state!.libraryItemId)).playerSettings;
return 'PlaybackSyncError: $message'; // // var appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
}
} // // var configurePlayerForEveryBook =
// // appPlayerSettings.configurePlayerForEveryBook;
// // await Future.wait([
// // audioService.setSourceAudiobook(
// // state!.asExpanded,
// // 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,
// // ),
// // ]);
// // }
// // }
// class PlaybackSyncError implements Exception {
// String message;
// PlaybackSyncError([this.message = 'Error syncing playback']);
// @override
// String toString() {
// return 'PlaybackSyncError: $message';
// }
// }

41
lib/features/player/providers/audiobook_player.g.dart
View file

@ -1,41 +0,0 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'audiobook_player.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$audioHandlerInitHash() => r'80f9912c0a93b4bbfe7da3967966065e78f2f6c2';
/// 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'9599b094cdd9eca614c27ec5bdf2d5259d20ac5f';
/// 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>;
// 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

20
lib/features/player/providers/currently_playing_provider.dart
View file

@ -1,13 +1,13 @@
import 'package:hooks_riverpod/hooks_riverpod.dart'; // import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; // import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:shelfsdk/audiobookshelf_api.dart' as core; // import 'package:shelfsdk/audiobookshelf_api.dart' as core;
import 'package:vaani/api/api_provider.dart'; // import 'package:vaani/api/api_provider.dart';
import 'package:vaani/api/library_item_provider.dart'; // import 'package:vaani/api/library_item_provider.dart';
import 'package:vaani/features/downloads/providers/download_manager.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/per_book_settings/providers/book_settings_provider.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart'; // import 'package:vaani/features/player/providers/audiobook_player.dart';
import 'package:vaani/features/settings/app_settings_provider.dart'; // import 'package:vaani/features/settings/app_settings_provider.dart';
import 'package:vaani/globals.dart'; // import 'package:vaani/globals.dart';
// part 'currently_playing_provider.g.dart'; // part 'currently_playing_provider.g.dart';

66
lib/features/player/providers/player_status_provider.dart
View file

@ -1,40 +1,40 @@
import 'package:riverpod_annotation/riverpod_annotation.dart'; // import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:vaani/features/player/core/player_status.dart' as core; // import 'package:vaani/features/player/core/player_status.dart' as core;
part 'player_status_provider.g.dart'; // part 'player_status_provider.g.dart';
@Riverpod(keepAlive: true) // @Riverpod(keepAlive: true)
class PlayerStatus extends _$PlayerStatus { // class PlayerStatus extends _$PlayerStatus {
@override // @override
core.PlayerStatus build() { // core.PlayerStatus build() {
return core.PlayerStatus(); // return core.PlayerStatus();
} // }
void setPlayStatus(core.PlayStatus playStatus) { // void setPlayStatus(core.PlayStatus playStatus) {
state = state.copyWith(playStatus: playStatus); // state = state.copyWith(playStatus: playStatus);
} // }
void setPlayStatusQuietly(core.PlayStatus playStatus) { // void setPlayStatusQuietly(core.PlayStatus playStatus) {
// state.copyWith(quite: true); // // state.copyWith(quite: true);
setPlayStatus(playStatus); // setPlayStatus(playStatus);
// state.copyWith(quite: false); // // state.copyWith(quite: false);
} // }
// 校验原值, 不相同则更新 // // 校验原值, 不相同则更新
void setPlayStatusVerify(core.PlayStatus playStatus) { // void setPlayStatusVerify(core.PlayStatus playStatus) {
if (state.playStatus != playStatus) { // if (state.playStatus != playStatus) {
setPlayStatus(playStatus); // setPlayStatus(playStatus);
} // }
} // }
void setLoading(String itemId) { // void setLoading(String itemId) {
state = state.copyWith( // state = state.copyWith(
playStatus: core.PlayStatus.loading, // playStatus: core.PlayStatus.loading,
itemId: itemId, // itemId: itemId,
); // );
} // }
void setHidden() { // void setHidden() {
state = state.copyWith(playStatus: core.PlayStatus.hidden); // state = state.copyWith(playStatus: core.PlayStatus.hidden);
} // }
} // }

25
lib/features/player/providers/player_status_provider.g.dart
View file

@ -1,25 +0,0 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'player_status_provider.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$playerStatusHash() => r'4a8f222b8c1d5c92883f4358c69571c35a378861';
/// See also [PlayerStatus].
@ProviderFor(PlayerStatus)
final playerStatusProvider =
NotifierProvider<PlayerStatus, core.PlayerStatus>.internal(
PlayerStatus.new,
name: r'playerStatusProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product') ? null : _$playerStatusHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$PlayerStatus = Notifier<core.PlayerStatus>;
// 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

4
lib/features/player/view/mini_player_bottom_padding.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:vaani/features/player/providers/player_status_provider.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/globals.dart' show playerMinHeight; import 'package:vaani/globals.dart' show playerMinHeight;
class MiniPlayerBottomPadding extends HookConsumerWidget { class MiniPlayerBottomPadding extends HookConsumerWidget {
@ -9,7 +9,7 @@ class MiniPlayerBottomPadding extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
return AnimatedSize( return AnimatedSize(
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),
child: ref.watch(playerStatusProvider).isPlaying() child: ref.watch(absAudioPlayerProvider).playing
? const SizedBox(height: playerMinHeight + 8) ? const SizedBox(height: playerMinHeight + 8)
: const SizedBox.shrink(), : const SizedBox.shrink(),
); );

3
lib/features/player/view/player_expanded_desktop.dart
View file

@ -6,7 +6,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:shelfsdk/audiobookshelf_api.dart'; import 'package:shelfsdk/audiobookshelf_api.dart';
import 'package:vaani/constants/sizes.dart'; import 'package:vaani/constants/sizes.dart';
import 'package:vaani/features/player/providers/abs_provider.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart';
import 'package:vaani/features/player/view/player_expanded.dart' import 'package:vaani/features/player/view/player_expanded.dart'
show PlayerExpandedImage; show PlayerExpandedImage;
import 'package:vaani/features/player/view/player_minimized.dart'; import 'package:vaani/features/player/view/player_minimized.dart';
@ -201,7 +200,7 @@ class ChapterSelection extends HookConsumerWidget {
selected: isCurrent, selected: isCurrent,
// key: isCurrent ? chapterKey : null, // key: isCurrent ? chapterKey : null,
onTap: () { onTap: () {
ref.read(playerProvider).skipToChapter(chapter.id); ref.read(absAudioPlayerProvider).switchChapter(chapter.id);
}, },
); );
}, },

5
lib/features/player/view/widgets/chapter_selection_button.dart
View file

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_animate/flutter_animate.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:vaani/features/player/providers/abs_provider.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart';
import 'package:vaani/features/player/view/player_expanded.dart' import 'package:vaani/features/player/view/player_expanded.dart'
show pendingPlayerModals; show pendingPlayerModals;
import 'package:vaani/features/player/view/widgets/playing_indicator_icon.dart'; import 'package:vaani/features/player/view/widgets/playing_indicator_icon.dart';
@ -117,8 +116,8 @@ class ChapterSelectionModal extends HookConsumerWidget {
onTap: () { onTap: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
ref ref
.read(playerProvider) .read(absAudioPlayerProvider)
.skipToChapter(chapter.id); .switchChapter(chapter.id);
}, },
); );
}, },

8
lib/features/player/view/widgets/player_player_pause_button.dart
View file

@ -21,12 +21,12 @@ class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
); );
} }
Widget _getIcon(PlayerState playerState, BuildContext context) { Widget _getIcon(AbsPlayerState playerState, BuildContext context) {
if (playerState.playing) { if (playerState.playing) {
return Icon(size: iconSize, Icons.pause); return Icon(size: iconSize, Icons.pause);
} else { } else {
switch (playerState.processingState) { switch (playerState.processingState) {
case ProcessingState.loading || ProcessingState.buffering: case AbsProcessingState.loading || AbsProcessingState.buffering:
return CircularProgressIndicator(); return CircularProgressIndicator();
default: default:
return Icon(size: iconSize, Icons.play_arrow); return Icon(size: iconSize, Icons.play_arrow);
@ -34,13 +34,13 @@ class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
} }
} }
void _actionButtonPressed(PlayerState playerState, WidgetRef ref) async { void _actionButtonPressed(AbsPlayerState playerState, WidgetRef ref) async {
final player = ref.read(absAudioPlayerProvider); final player = ref.read(absAudioPlayerProvider);
if (playerState.playing) { if (playerState.playing) {
await player.pause(); await player.pause();
} else { } else {
switch (playerState.processingState) { switch (playerState.processingState) {
case ProcessingState.completed: case AbsProcessingState.completed:
await player.seekInBook(const Duration(seconds: 0)); await player.seekInBook(const Duration(seconds: 0));
await player.play(); await player.play();
default: default:

1
lib/features/player/view/widgets/player_progress_bar.dart
View file

@ -4,7 +4,6 @@ import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:vaani/constants/sizes.dart'; import 'package:vaani/constants/sizes.dart';
import 'package:vaani/features/player/providers/abs_provider.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart';
class AudiobookChapterProgressBar extends HookConsumerWidget { class AudiobookChapterProgressBar extends HookConsumerWidget {
const AudiobookChapterProgressBar({ const AudiobookChapterProgressBar({

4
lib/features/player/view/widgets/speed_selector.dart
View file

@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:list_wheel_scroll_view_nls/list_wheel_scroll_view_nls.dart'; import 'package:list_wheel_scroll_view_nls/list_wheel_scroll_view_nls.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/settings/app_settings_provider.dart'; import 'package:vaani/features/settings/app_settings_provider.dart';
const double itemExtent = 25; const double itemExtent = 25;
@ -22,7 +22,7 @@ class SpeedSelector extends HookConsumerWidget {
final appSettings = ref.watch(appSettingsProvider); final appSettings = ref.watch(appSettingsProvider);
final playerSettings = appSettings.playerSettings; final playerSettings = appSettings.playerSettings;
final speeds = playerSettings.speedOptions; final speeds = playerSettings.speedOptions;
final currentSpeed = ref.watch(playerProvider).player.speed; final currentSpeed = ref.watch(absAudioPlayerProvider).speed;
final speedState = useState(currentSpeed); final speedState = useState(currentSpeed);
// hook the onSpeedSelected function to the state // hook the onSpeedSelected function to the state

26
lib/features/shake_detector/shake_detector_provider.dart
View file

@ -2,12 +2,13 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:just_audio/just_audio.dart'; import 'package:just_audio/just_audio.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/sleep_timer/providers/sleep_timer_provider.dart'
show sleepTimerProvider;
import 'package:vaani/features/settings/app_settings_provider.dart' import 'package:vaani/features/settings/app_settings_provider.dart'
show appSettingsProvider; show appSettingsProvider;
import 'package:vaani/features/settings/models/app_settings.dart'; import 'package:vaani/features/settings/models/app_settings.dart';
import 'package:vaani/features/sleep_timer/providers/sleep_timer_provider.dart'
show sleepTimerProvider;
import 'package:vaani/shared/audio_player.dart';
import 'package:vibration/vibration.dart'; import 'package:vibration/vibration.dart';
import 'shake_detector.dart' as core; import 'shake_detector.dart' as core;
@ -31,14 +32,15 @@ class ShakeDetector extends _$ShakeDetector {
} }
// if no book is loaded, shake detection should not be enabled // if no book is loaded, shake detection should not be enabled
final player = ref.watch(playerProvider); final player = ref.watch(absAudioPlayerProvider);
player.playerStateStream.listen((event) { player.playerStateStream.listen((event) {
if (event.processingState == ProcessingState.idle && wasPlayerLoaded) { if (event.processingState == AbsProcessingState.idle && wasPlayerLoaded) {
_logger.config('Player is now not loaded, invalidating'); _logger.config('Player is now not loaded, invalidating');
wasPlayerLoaded = false; wasPlayerLoaded = false;
ref.invalidateSelf(); ref.invalidateSelf();
} }
if (event.processingState != ProcessingState.idle && !wasPlayerLoaded) { if (event.processingState != AbsProcessingState.idle &&
!wasPlayerLoaded) {
_logger.config('Player is now loaded, invalidating'); _logger.config('Player is now loaded, invalidating');
wasPlayerLoaded = true; wasPlayerLoaded = true;
ref.invalidateSelf(); ref.invalidateSelf();
@ -86,7 +88,7 @@ class ShakeDetector extends _$ShakeDetector {
ShakeAction shakeAction, { ShakeAction shakeAction, {
required Ref ref, required Ref ref,
}) { }) {
final player = ref.read(playerProvider); final player = ref.read(absAudioPlayerProvider);
if (player.book == null && shakeAction.isPlaybackManagementEnabled) { if (player.book == null && shakeAction.isPlaybackManagementEnabled) {
_logger.warning('No book is loaded'); _logger.warning('No book is loaded');
return false; return false;
@ -103,23 +105,23 @@ class ShakeDetector extends _$ShakeDetector {
return true; return true;
case ShakeAction.fastForward: case ShakeAction.fastForward:
_logger.fine('Fast forwarding'); _logger.fine('Fast forwarding');
if (!player.player.playerState.playing) { if (!player.playing) {
_logger.warning('Player is not playing'); _logger.warning('Player is not playing');
return false; return false;
} }
player.seek(player.player.position + const Duration(seconds: 30)); player.seek(player.position + const Duration(seconds: 30));
return true; return true;
case ShakeAction.rewind: case ShakeAction.rewind:
_logger.fine('Rewinding'); _logger.fine('Rewinding');
if (!player.player.playerState.playing) { if (!player.playing) {
_logger.warning('Player is not playing'); _logger.warning('Player is not playing');
return false; return false;
} }
player.seek(player.player.position - const Duration(seconds: 30)); player.seek(player.position - const Duration(seconds: 30));
return true; return true;
case ShakeAction.playPause: case ShakeAction.playPause:
_logger.fine('Toggling play/pause'); _logger.fine('Toggling play/pause');
player.togglePlayPause(); player.playOrPause();
return true; return true;
default: default:
return false; return false;

2
lib/features/shake_detector/shake_detector_provider.g.dart
View file

@ -6,7 +6,7 @@ part of 'shake_detector_provider.dart';
// RiverpodGenerator // RiverpodGenerator
// ************************************************************************** // **************************************************************************
String _$shakeDetectorHash() => r'b63082b9016958e6c1e46ff874c98a0c99721f04'; String _$shakeDetectorHash() => r'ea00d8c830ef67f968bee25e0f924a35dc3e4cbf';
/// See also [ShakeDetector]. /// See also [ShakeDetector].
@ProviderFor(ShakeDetector) @ProviderFor(ShakeDetector)

8
lib/features/skip_start_end/core/skip_start_end.dart
View file

@ -1,13 +1,13 @@
import 'dart:async'; import 'dart:async';
import 'package:vaani/features/player/core/audiobook_player.dart'; import 'package:vaani/shared/audio_player.dart';
import 'package:vaani/shared/extensions/chapter.dart'; import 'package:vaani/shared/extensions/chapter.dart';
import 'package:vaani/shared/utils/throttler.dart'; import 'package:vaani/shared/utils/throttler.dart';
class SkipStartEnd { class SkipStartEnd {
final Duration start; final Duration start;
final Duration end; final Duration end;
final AbsAudioHandler player; final AbsAudioPlayer player;
final List<StreamSubscription> _subscriptions = []; final List<StreamSubscription> _subscriptions = [];
final throttlerStart = Throttler(delay: Duration(seconds: 3)); final throttlerStart = Throttler(delay: Duration(seconds: 3));
@ -33,12 +33,12 @@ class SkipStartEnd {
} }
if (end > Duration.zero) { if (end > Duration.zero) {
_subscriptions.add( _subscriptions.add(
player.positionStreamInChapter.listen((positionChapter) { player.positionInChapterStream.listen((positionChapter) {
if (end > if (end >
(player.currentChapter?.duration ?? Duration.zero) - (player.currentChapter?.duration ?? Duration.zero) -
positionChapter) { positionChapter) {
Future.microtask( Future.microtask(
() => throttlerEnd.call(() => player.skipToNext()), () => throttlerEnd.call(() => player.next()),
); );
} }
}), }),

3
lib/features/skip_start_end/providers/skip_start_end_provider.dart
View file

@ -1,7 +1,6 @@
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart'; import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
import 'package:vaani/features/player/providers/abs_provider.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart';
import 'package:vaani/features/skip_start_end/core/skip_start_end.dart' as core; import 'package:vaani/features/skip_start_end/core/skip_start_end.dart' as core;
part 'skip_start_end_provider.g.dart'; part 'skip_start_end_provider.g.dart';
@ -16,7 +15,7 @@ class SkipStartEnd extends _$SkipStartEnd {
return null; return null;
} }
final player = ref.read(playerProvider); final player = ref.read(absAudioPlayerProvider);
final bookSettings = ref.watch(bookSettingsProvider(bookId)); final bookSettings = ref.watch(bookSettingsProvider(bookId));
final start = bookSettings.playerSettings.skipChapterStart; final start = bookSettings.playerSettings.skipChapterStart;
final end = bookSettings.playerSettings.skipChapterEnd; final end = bookSettings.playerSettings.skipChapterEnd;

2
lib/features/skip_start_end/providers/skip_start_end_provider.g.dart
View file

@ -6,7 +6,7 @@ part of 'skip_start_end_provider.dart';
// RiverpodGenerator // RiverpodGenerator
// ************************************************************************** // **************************************************************************
String _$skipStartEndHash() => r'ba92dd22fc76f04cb5aaa220d025eb69c9d2ba46'; String _$skipStartEndHash() => r'b55dff90ed4ba467e9320d6bc081721336975bdb';
/// See also [SkipStartEnd]. /// See also [SkipStartEnd].
@ProviderFor(SkipStartEnd) @ProviderFor(SkipStartEnd)

10
lib/features/sleep_timer/core/sleep_timer.dart
View file

@ -1,8 +1,8 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_animate/flutter_animate.dart';
import 'package:just_audio/just_audio.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:vaani/shared/audio_player.dart';
/// this timer pauses the music player after a certain duration /// this timer pauses the music player after a certain duration
/// ///
@ -32,7 +32,7 @@ class SleepTimer {
} }
/// The player to be paused /// The player to be paused
final AudioPlayer player; final AbsAudioPlayer player;
/// The timer that will pause the player /// The timer that will pause the player
Timer? timer; Timer? timer;
@ -49,9 +49,9 @@ class SleepTimer {
SleepTimer({required duration, required this.player}) : _duration = duration { SleepTimer({required duration, required this.player}) : _duration = duration {
_subscriptions.add( _subscriptions.add(
player.playbackEventStream.listen((event) { player.playerStateStream.listen((event) {
if (event.processingState == ProcessingState.completed || if (event.processingState == AbsProcessingState.completed ||
event.processingState == ProcessingState.idle) { event.processingState == AbsProcessingState.idle) {
clearCountDownTimer(); clearCountDownTimer();
} }
}), }),

6
lib/features/sleep_timer/providers/sleep_timer_provider.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:vaani/features/player/providers/audiobook_player.dart'; import 'package:vaani/features/player/providers/abs_provider.dart';
import 'package:vaani/features/sleep_timer/core/sleep_timer.dart' as core; import 'package:vaani/features/sleep_timer/core/sleep_timer.dart' as core;
import 'package:vaani/features/settings/app_settings_provider.dart'; import 'package:vaani/features/settings/app_settings_provider.dart';
import 'package:vaani/shared/extensions/time_of_day.dart'; import 'package:vaani/shared/extensions/time_of_day.dart';
@ -26,7 +26,7 @@ class SleepTimer extends _$SleepTimer {
var sleepTimer = core.SleepTimer( var sleepTimer = core.SleepTimer(
duration: sleepTimerSettings.defaultDuration, duration: sleepTimerSettings.defaultDuration,
player: ref.watch(playerProvider).player, player: ref.watch(absAudioPlayerProvider),
); );
ref.onDispose(sleepTimer.dispose); ref.onDispose(sleepTimer.dispose);
return sleepTimer; return sleepTimer;
@ -45,7 +45,7 @@ class SleepTimer extends _$SleepTimer {
} else { } else {
final timer = core.SleepTimer( final timer = core.SleepTimer(
duration: resultingDuration, duration: resultingDuration,
player: ref.watch(playerProvider).player, player: ref.watch(absAudioPlayerProvider),
); );
ref.onDispose(timer.dispose); ref.onDispose(timer.dispose);
state = timer; state = timer;

2
lib/features/sleep_timer/providers/sleep_timer_provider.g.dart
View file

@ -6,7 +6,7 @@ part of 'sleep_timer_provider.dart';
// RiverpodGenerator // RiverpodGenerator
// ************************************************************************** // **************************************************************************
String _$sleepTimerHash() => r'daaaf63d599fb991e71a0da0ca1075fb46ccc6be'; String _$sleepTimerHash() => r'8d91e2f7563320985ff5693b539288a93ff0d243';
/// See also [SleepTimer]. /// See also [SleepTimer].
@ProviderFor(SleepTimer) @ProviderFor(SleepTimer)

23
lib/shared/audio_player.dart
View file

@ -20,15 +20,15 @@ final _logger = Logger('AbsAudioPlayer');
abstract class AbsAudioPlayer { abstract class AbsAudioPlayer {
final _mediaItemController = BehaviorSubject<MediaItem?>.seeded(null); final _mediaItemController = BehaviorSubject<MediaItem?>.seeded(null);
final playerStateSubject = final playerStateSubject =
BehaviorSubject.seeded(PlayerState(false, ProcessingState.idle)); BehaviorSubject.seeded(AbsPlayerState(false, AbsProcessingState.idle));
final _bookStreamController = BehaviorSubject<BookExpanded?>.seeded(null); final _bookStreamController = BehaviorSubject<BookExpanded?>.seeded(null);
final _chapterStreamController = BehaviorSubject<BookChapter?>.seeded(null); final _chapterStreamController = BehaviorSubject<BookChapter?>.seeded(null);
BookExpanded? get book => _bookStreamController.nvalue; BookExpanded? get book => _bookStreamController.nvalue;
BookChapter? get currentChapter => _chapterStreamController.nvalue; BookChapter? get currentChapter => _chapterStreamController.nvalue;
PlayerState get playerState => playerStateSubject.value; AbsPlayerState get playerState => playerStateSubject.value;
Stream<MediaItem?> get mediaItemStream => _mediaItemController.stream; Stream<MediaItem?> get mediaItemStream => _mediaItemController.stream;
Stream<PlayerState> get playerStateStream => playerStateSubject.stream; Stream<AbsPlayerState> get playerStateStream => playerStateSubject.stream;
Future<void> load( Future<void> load(
BookExpanded book, { BookExpanded book, {
@ -71,7 +71,7 @@ abstract class AbsAudioPlayer {
baseUrl: baseUrl, token: token), baseUrl: baseUrl, token: token),
) )
.toList(); .toList();
setPlayList(playlist, index: indexTrack, position: positionInTrack); await setPlayList(playlist, index: indexTrack, position: positionInTrack);
} }
Future<void> setPlayList( Future<void> setPlayList(
@ -138,6 +138,7 @@ abstract class AbsAudioPlayer {
await seekInBook(chapter.start + offset); await seekInBook(chapter.start + offset);
} }
bool get playing => playerState.playing;
Stream<bool> get playingStream; Stream<bool> get playingStream;
Stream<BookExpanded?> get bookStream => _bookStreamController.stream; Stream<BookExpanded?> get bookStream => _bookStreamController.stream;
Stream<BookChapter?> get chapterStream => _chapterStreamController.stream; Stream<BookChapter?> get chapterStream => _chapterStreamController.stream;
@ -185,7 +186,7 @@ abstract class AbsAudioPlayer {
} }
/// Enumerates the different processing states of a player. /// Enumerates the different processing states of a player.
enum ProcessingState { enum AbsProcessingState {
/// The player has not loaded an [AudioSource]. /// The player has not loaded an [AudioSource].
idle, idle,
@ -206,15 +207,15 @@ enum ProcessingState {
/// orthogonally, and so if [processingState] is [ProcessingState.buffering], /// orthogonally, and so if [processingState] is [ProcessingState.buffering],
/// you can check [playing] to determine whether the buffering occurred while /// you can check [playing] to determine whether the buffering occurred while
/// the player was playing or while the player was paused. /// the player was playing or while the player was paused.
class PlayerState { class AbsPlayerState {
/// Whether the player will play when [processingState] is /// Whether the player will play when [processingState] is
/// [ProcessingState.ready]. /// [ProcessingState.ready].
final bool playing; final bool playing;
/// The current processing state of the player. /// The current processing state of the player.
final ProcessingState processingState; final AbsProcessingState processingState;
PlayerState(this.playing, this.processingState); AbsPlayerState(this.playing, this.processingState);
@override @override
String toString() => 'playing=$playing,processingState=$processingState'; String toString() => 'playing=$playing,processingState=$processingState';
@ -229,11 +230,11 @@ class PlayerState {
other.playing == playing && other.playing == playing &&
other.processingState == processingState; other.processingState == processingState;
PlayerState copyWith({ AbsPlayerState copyWith({
bool? playing, bool? playing,
ProcessingState? processingState, AbsProcessingState? processingState,
}) { }) {
return PlayerState( return AbsPlayerState(
playing ?? this.playing, playing ?? this.playing,
processingState ?? this.processingState, processingState ?? this.processingState,
); );

30
lib/shared/audio_player_mpv.dart
View file

@ -12,20 +12,23 @@ class AbsMpvAudioPlayer extends AbsAudioPlayer {
state.copyWith( state.copyWith(
playing: playing, playing: playing,
processingState: playing processingState: playing
? state.processingState == ProcessingState.idle ? state.processingState == AbsProcessingState.idle
? ProcessingState.ready ? AbsProcessingState.ready
: state.processingState : state.processingState
: player.state.buffering : player.state.buffering
? ProcessingState.buffering ? AbsProcessingState.buffering
: player.state.completed : player.state.completed
? ProcessingState.completed ? AbsProcessingState.completed
: ProcessingState.ready, : AbsProcessingState.ready,
), ),
); );
}); });
} }
@override @override
Stream<Duration> get bufferedPositionInBookStream => player.stream.buffer; Duration get bufferedPosition => player.state.buffer;
@override
Stream<Duration> get bufferedPositionStream => player.stream.buffer;
@override @override
int get currentIndex => player.state.playlist.index; int get currentIndex => player.state.playlist.index;
@ -45,6 +48,9 @@ class AbsMpvAudioPlayer extends AbsAudioPlayer {
await player.playOrPause(); await player.playOrPause();
} }
@override
Stream<bool> get playingStream => player.stream.playing;
@override @override
Duration get position => player.state.position; Duration get position => player.state.position;
@ -91,17 +97,5 @@ class AbsMpvAudioPlayer extends AbsAudioPlayer {
} }
@override @override
Stream<bool> get playingStream => player.stream.playing;
@override
// TODO: implement speed
double get speed => player.state.rate; double get speed => player.state.rate;
@override
// TODO: implement bufferedPosition
Duration get bufferedPosition => player.state.buffer;
@override
// TODO: implement bufferedPositionStream
Stream<Duration> get bufferedPositionStream => player.stream.buffer;
} }

96
lib/shared/audio_player_platform.dart Normal file
View file

@ -0,0 +1,96 @@
import 'package:just_audio/just_audio.dart';
import 'package:logging/logging.dart';
import 'package:vaani/shared/audio_player.dart';
final _logger = Logger('AbsPlatformAudioPlayer');
class AbsPlatformAudioPlayer extends AbsAudioPlayer {
final AudioPlayer player = AudioPlayer();
AbsPlatformAudioPlayer() {
player.playerStateStream.listen((state) {
playerStateSubject.add(
playerState.copyWith(
playing: state.playing,
processingState: {
ProcessingState.idle: AbsProcessingState.idle,
ProcessingState.buffering: AbsProcessingState.buffering,
ProcessingState.completed: AbsProcessingState.completed,
ProcessingState.loading: AbsProcessingState.loading,
ProcessingState.ready: AbsProcessingState.ready,
}[state.processingState],
),
);
});
}
@override
Duration get bufferedPosition => player.bufferedPosition;
@override
Stream<Duration> get bufferedPositionStream => player.bufferedPositionStream;
@override
int get currentIndex => player.currentIndex ?? 0;
@override
Future<void> pause() async {
await player.pause();
}
@override
Future<void> play() async {
await player.play();
}
@override
Future<void> playOrPause() async {
player.playing ? await player.pause() : await player.play();
}
@override
Stream<bool> get playingStream => player.playingStream;
@override
Duration get position => player.position;
@override
Stream<Duration> get positionStream => player.positionStream;
@override
Future<void> seek(Duration position, {int? index}) async {
await player.seek(position, index: index);
}
@override
Future<void> setPlayList(
List<Uri> playlist, {
int? index,
Duration? position,
}) async {
List<AudioSource> audioSources =
playlist.map((uri) => AudioSource.uri(uri)).toList();
await player
.setAudioSources(
audioSources,
preload: true,
initialIndex: index,
initialPosition: position,
)
.catchError((error) {
_logger.shout('Error in setting audio source: $error');
return null;
});
}
@override
Future<void> setSpeed(double speed) async {
await player.setSpeed(speed);
}
@override
Future<void> setVolume(double volume) async {
await player.setVolume(volume);
}
@override
double get speed => player.speed;
}