groove/Vaani
1
0
Fork 0
mirror of https://github.com/Dr-Blank/Vaani.git synced 2026-02-16 06:19:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

111

Browse source
This commit is contained in:
rang 2025-12-12 15:38:47 +08:00
parent 36f14dbd58
commit 5abf938dcf
26 changed files with 104 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -467,8 +467,8 @@ class _LibraryItemPlayButton extends HookConsumerWidget {
return ElevatedButton.icon(
onPressed: () {
currentBook?.libraryItemId == book.libraryItemId
? ref.read(audioPlayerProvider).playOrPause()
: ref.read(audioPlayerProvider.notifier).load(
? ref.read(absPlayerProvider).playOrPause()
: ref.read(absPlayerProvider.notifier).load(
book,
initialPosition: userMediaProgress?.currentTime,
);

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

@ -139,7 +139,7 @@ class _LibraryItemProgressIndicator extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.watch(audioPlayerProvider);
final player = ref.watch(absPlayerProvider);
final libraryItem = ref.watch(libraryItemProvider(id)).valueOrNull;
if (libraryItem == null) {
return const SizedBox.shrink();

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

@ -13,7 +13,7 @@ class PlaybackReporter extends _$PlaybackReporter {
@override
Future<core.PlaybackReporter> build() async {
final playerSettings = ref.watch(appSettingsProvider).playerSettings;
final player = ref.watch(audioPlayerProvider);
final player = ref.watch(absPlayerProvider);
final api = ref.watch(authenticatedApiProvider);
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
// **************************************************************************
String _$playbackReporterHash() => r'1cdf5cbc614c05c240d28bf0ec740d3899fd957a';
String _$playbackReporterHash() => r'0a3d3a7b10a020c9ee4b6465663e83b8f75b36c5';
/// See also [PlaybackReporter].
@ProviderFor(PlaybackReporter)

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

@ -1,4 +1,3 @@
// ignore_for_file: public_member_api_docs, sort_constructors_first
import 'dart:async';
import 'package:audio_service/audio_service.dart';
@ -32,6 +31,7 @@ abstract class AbsAudioPlayer {
Stream<MediaItem?> get mediaItemStream => _mediaItemController.stream;
Stream<AbsPlayerState> get playerStateStream => playerStateSubject.stream;
// 加载整本书
Future<void> load(
BookExpanded book, {
required Uri baseUrl,

35
lib/features/player/core/abs_audio_player_platform.dart
View file

@ -8,8 +8,9 @@ final _logger = Logger('AbsPlatformAudioPlayer');
/// 音频播放器 平台ios,macos,android (just_audio)
class AbsPlatformAudioPlayer extends AbsAudioPlayer {
late final AudioPlayer player;
AbsPlatformAudioPlayer() {
late final AudioPlayer _player;
AbsPlatformAudioPlayer(AudioPlayer player) {
_player = player;
// 跳转到播放列表指定条目指定位置
// prefetch-playlist=yes
JustAudioMediaKit.prefetchPlaylist = true;
@ -48,41 +49,41 @@ class AbsPlatformAudioPlayer extends AbsAudioPlayer {
});
}
@override
Duration get bufferedPosition => player.bufferedPosition;
Duration get bufferedPosition => _player.bufferedPosition;
@override
Stream<Duration> get bufferedPositionStream => player.bufferedPositionStream;
Stream<Duration> get bufferedPositionStream => _player.bufferedPositionStream;
@override
int get currentIndex => player.currentIndex ?? 0;
int get currentIndex => _player.currentIndex ?? 0;
@override
Future<void> pause() async {
await player.pause();
await _player.pause();
}
@override
Future<void> play() async {
await player.play();
await _player.play();
}
@override
Future<void> playOrPause() async {
player.playing ? await player.pause() : await player.play();
_player.playing ? await _player.pause() : await _player.play();
}
@override
Stream<bool> get playingStream => player.playingStream;
Stream<bool> get playingStream => _player.playingStream;
@override
Duration get position => player.position;
Duration get position => _player.position;
@override
Stream<Duration> get positionStream => player.positionStream;
Stream<Duration> get positionStream => _player.positionStream;
@override
Future<void> seek(Duration position, {int? index}) async {
await player.seek(position, index: index);
await _player.seek(position, index: index);
}
@override
@ -93,7 +94,7 @@ class AbsPlatformAudioPlayer extends AbsAudioPlayer {
}) async {
List<AudioSource> audioSources =
playlist.map((uri) => AudioSource.uri(uri)).toList();
await player
await _player
.setAudioSources(
audioSources,
preload: true,
@ -108,20 +109,20 @@ class AbsPlatformAudioPlayer extends AbsAudioPlayer {
@override
Future<void> setSpeed(double speed) async {
await player.setSpeed(speed);
await _player.setSpeed(speed);
}
@override
Future<void> setVolume(double volume) async {
await player.setVolume(volume);
await _player.setVolume(volume);
}
@override
double get speed => player.speed;
double get speed => _player.speed;
@override
void dispose() {
super.dispose();
player.dispose();
_player.dispose();
}
}

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

@ -1,6 +1,8 @@
import 'package:audio_service/audio_service.dart';
import 'package:audio_session/audio_session.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:just_audio/just_audio.dart';
import 'package:just_audio_media_kit/just_audio_media_kit.dart';
import 'package:logging/logging.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:shelfsdk/audiobookshelf_api.dart' as api;
@ -16,7 +18,7 @@ final _logger = Logger('AbsPlayerProvider');
/// 音频播放器 配置
@Riverpod(keepAlive: true)
Future<AudioHandler> configurePlayer(Ref ref) async {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
// for playing audio on windows, linux
// for configuring how this app will interact with other audio apps
@ -43,13 +45,28 @@ Future<AudioHandler> configurePlayer(Ref ref) async {
return audioService;
}
// just_audio 播放器
@Riverpod(keepAlive: true)
AudioPlayer audioPlayer(Ref ref) {
// 跳转到播放列表指定条目指定位置
// prefetch-playlist=yes
JustAudioMediaKit.prefetchPlaylist = true;
// merge-files=yes
// cache=yes
// cache-pause-wait=60
JustAudioMediaKit.ensureInitialized();
return AudioPlayer();
}
/// 音频播放器 riverpod状态
@Riverpod(keepAlive: true)
class AudioPlayer extends _$AudioPlayer {
class AbsPlayer extends _$AbsPlayer {
@override
core.AbsAudioPlayer build() {
final audioPlayer = ref.watch(audioPlayerProvider);
// final player = AbsMpvAudioPlayer();
final player = AbsPlatformAudioPlayer();
final player = AbsPlatformAudioPlayer(audioPlayer);
ref.onDispose(player.dispose);
return player;
}
@ -77,7 +94,7 @@ class AudioPlayer extends _$AudioPlayer {
class PlayerState extends _$PlayerState {
@override
core.AbsPlayerState build() {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
player.playerStateStream.listen((playerState) {
if (playerState != state) {
state = playerState;
@ -87,7 +104,7 @@ class PlayerState extends _$PlayerState {
}
bool isLoading(String itemId) {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
return player.book?.libraryItemId == itemId &&
!state.playing &&
state.processingState == core.AbsProcessingState.loading;
@ -102,7 +119,7 @@ class PlayerState extends _$PlayerState {
class CurrentBook extends _$CurrentBook {
@override
api.BookExpanded? build() {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
player.bookStream.listen((book) {
if (book != state) {
state = book;
@ -114,7 +131,7 @@ class CurrentBook extends _$CurrentBook {
@riverpod
bool isPlayerActive(Ref ref) {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
player.bookStream.listen((book) {
ref.invalidateSelf();
});
@ -125,7 +142,7 @@ bool isPlayerActive(Ref ref) {
class CurrentChapter extends _$CurrentChapter {
@override
api.BookChapter? build() {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
player.chapterStream.listen((chapter) {
if (chapter != state) {
state = chapter;
@ -137,7 +154,7 @@ class CurrentChapter extends _$CurrentChapter {
@riverpod
Stream<Duration> positionChapter(Ref ref) {
return ref.read(audioPlayerProvider).positionInChapterStream;
return ref.read(absPlayerProvider).positionInChapterStream;
}
@riverpod

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

@ -6,7 +6,7 @@ part of 'abs_provider.dart';
// RiverpodGenerator
// **************************************************************************
String _$configurePlayerHash() => r'7e7003c815e7d240a67cd581931839cc60346707';
String _$configurePlayerHash() => r'7ac63b6c3a34c56f42be55bc7a4856dabaae1583';
/// 音频播放器 配置
///
@ -25,7 +25,23 @@ final configurePlayerProvider = FutureProvider<AudioHandler>.internal(
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef ConfigurePlayerRef = FutureProviderRef<AudioHandler>;
String _$isPlayerActiveHash() => r'71a24418ecf6c1a2d8160b0d0c8fc523d5679e76';
String _$audioPlayerHash() => r'd9d6cea83d03e36fac43367b6a24fd9d3a53b2fa';
/// See also [audioPlayer].
@ProviderFor(audioPlayer)
final audioPlayerProvider = Provider<AudioPlayer>.internal(
audioPlayer,
name: r'audioPlayerProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product') ? null : _$audioPlayerHash,
dependencies: null,
allTransitiveDependencies: null,
);
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef AudioPlayerRef = ProviderRef<AudioPlayer>;
String _$isPlayerActiveHash() => r'4fca4af53a17dbcd7c8a98ce115bc11fa39b4cf9';
/// See also [isPlayerActive].
@ProviderFor(isPlayerActive)
@ -42,7 +58,7 @@ final isPlayerActiveProvider = AutoDisposeProvider<bool>.internal(
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef IsPlayerActiveRef = AutoDisposeProviderRef<bool>;
String _$positionChapterHash() => r'750b8e2f2c7217b59c3d77ed66dd20798f8787fa';
String _$positionChapterHash() => r'ac6148e92363fad849713c07045503653dcaa7e8';
/// See also [positionChapter].
@ProviderFor(positionChapter)
@ -77,24 +93,24 @@ final currentChaptersProvider =
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef CurrentChaptersRef = AutoDisposeProviderRef<List<api.BookChapter>>;
String _$audioPlayerHash() => r'e0efa20f340adf3312a76e5ca9e0c8ab0273a22a';
String _$absPlayerHash() => r'2ec8952e1ec764b02239ff7c26144040e460976a';
/// 音频播放器 riverpod状态
///
/// Copied from [AudioPlayer].
@ProviderFor(AudioPlayer)
final audioPlayerProvider =
NotifierProvider<AudioPlayer, core.AbsAudioPlayer>.internal(
AudioPlayer.new,
name: r'audioPlayerProvider',
/// Copied from [AbsPlayer].
@ProviderFor(AbsPlayer)
final absPlayerProvider =
NotifierProvider<AbsPlayer, core.AbsAudioPlayer>.internal(
AbsPlayer.new,
name: r'absPlayerProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product') ? null : _$audioPlayerHash,
const bool.fromEnvironment('dart.vm.product') ? null : _$absPlayerHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$AudioPlayer = Notifier<core.AbsAudioPlayer>;
String _$playerStateHash() => r'7e238aea9306cdfb952b546c76d1e894888c586f';
typedef _$AbsPlayer = Notifier<core.AbsAudioPlayer>;
String _$playerStateHash() => r'f195d2d13bcee0f91b862e669ab3549667d8dd2d';
/// See also [PlayerState].
@ProviderFor(PlayerState)
@ -109,7 +125,7 @@ final playerStateProvider =
);
typedef _$PlayerState = AutoDisposeNotifier<core.AbsPlayerState>;
String _$currentBookHash() => r'3684426dfde84e49dc2021e8444a2a3026082942';
String _$currentBookHash() => r'f511c6f16c17696e41c6384c5195646a419deae3';
/// See also [CurrentBook].
@ProviderFor(CurrentBook)
@ -124,7 +140,7 @@ final currentBookProvider =
);
typedef _$CurrentBook = AutoDisposeNotifier<api.BookExpanded?>;
String _$currentChapterHash() => r'28ac34fa83cbd6acf745e06b91b9ce36733fdbe5';
String _$currentChapterHash() => r'aff83aed7d098099805ec7d72ea84fff3a298522';
/// See also [CurrentChapter].
@ProviderFor(CurrentChapter)

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

@ -9,7 +9,7 @@ class MiniPlayerBottomPadding extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
return AnimatedSize(
duration: const Duration(milliseconds: 200),
child: ref.watch(audioPlayerProvider).playing
child: ref.watch(absPlayerProvider).playing
? const SizedBox(height: playerMinHeight + 8)
: const SizedBox.shrink(),
);

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

@ -223,7 +223,7 @@ class ChapterSelection extends HookConsumerWidget {
selected: isCurrent,
// key: isCurrent ? chapterKey : null,
onTap: () {
ref.read(audioPlayerProvider).switchChapter(chapter.id);
ref.read(absPlayerProvider).switchChapter(chapter.id);
},
);
},

2
lib/features/player/view/player_minimized.dart
View file

@ -148,7 +148,7 @@ class PlayerMinimizedProgress extends HookConsumerWidget {
final currentChapter = ref.watch(currentChapterProvider);
final progress = useStream(
ref.read(audioPlayerProvider).positionInChapterStream,
ref.read(absPlayerProvider).positionInChapterStream,
initialData: Duration.zero,
);
return SizedBox(

2
lib/features/player/view/widgets/audiobook_player_seek_button.dart
View file

@ -14,7 +14,7 @@ class AudiobookPlayerSeekButton extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
return IconButton(
icon: Icon(
isForward ? Icons.forward_30 : Icons.replay_30,

2
lib/features/player/view/widgets/audiobook_player_seek_chapter_button.dart
View file

@ -20,7 +20,7 @@ class AudiobookPlayerSeekChapterButton extends HookConsumerWidget {
size: AppElementSizes.iconSizeSmall,
),
onPressed: () {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
final book = ref.read(currentBookProvider);
if (book == null) {
return;

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

@ -116,7 +116,7 @@ class ChapterSelectionModal extends HookConsumerWidget {
onTap: () {
Navigator.of(context).pop();
ref
.read(audioPlayerProvider)
.read(absPlayerProvider)
.switchChapter(chapter.id);
},
);

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

@ -35,7 +35,7 @@ class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
}
void _actionButtonPressed(AbsPlayerState playerState, WidgetRef ref) async {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
if (playerState.playing) {
await player.pause();
} else {

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

@ -12,7 +12,7 @@ class AudiobookChapterProgressBar extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.watch(audioPlayerProvider);
final player = ref.watch(absPlayerProvider);
final currentChapter = ref.watch(currentChapterProvider);
final position = useStream(
player.positionInBookStream,
@ -63,7 +63,7 @@ class AudiobookProgressBar extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
final position = useStream(
player.positionInBookStream,
initialData: const Duration(seconds: 0),

2
lib/features/player/view/widgets/player_speed_adjust_button.dart
View file

@ -16,7 +16,7 @@ class PlayerSpeedAdjustButton extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
final book = ref.read(currentBookProvider);
final bookId = book?.libraryItemId ?? '_';
final bookSettings = ref.watch(bookSettingsProvider(bookId));

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

@ -22,7 +22,7 @@ class SpeedSelector extends HookConsumerWidget {
final appSettings = ref.watch(appSettingsProvider);
final playerSettings = appSettings.playerSettings;
final speeds = playerSettings.speedOptions;
final currentSpeed = ref.watch(audioPlayerProvider).speed;
final currentSpeed = ref.watch(absPlayerProvider).speed;
final speedState = useState(currentSpeed);
// hook the onSpeedSelected function to the state

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

@ -33,7 +33,7 @@ class ShakeDetector extends _$ShakeDetector {
}
// if no book is loaded, shake detection should not be enabled
final player = ref.watch(audioPlayerProvider);
final player = ref.watch(absPlayerProvider);
player.playerStateStream.listen((event) {
if (event.processingState == AbsProcessingState.idle && wasPlayerLoaded) {
_logger.config('Player is now not loaded, invalidating');
@ -89,7 +89,7 @@ class ShakeDetector extends _$ShakeDetector {
ShakeAction shakeAction, {
required Ref ref,
}) {
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
if (player.book == null && shakeAction.isPlaybackManagementEnabled) {
_logger.warning('No book is loaded');
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
// **************************************************************************
String _$shakeDetectorHash() => r'c75e0308478cd70ef4b5cdd5f72cf706d597900c';
String _$shakeDetectorHash() => r'8e65e89d59a9cf9492fd5f3eb309eb3a37cf1c6d';
/// See also [ShakeDetector].
@ProviderFor(ShakeDetector)

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

@ -15,7 +15,7 @@ class SkipStartEnd extends _$SkipStartEnd {
return null;
}
final player = ref.read(audioPlayerProvider);
final player = ref.read(absPlayerProvider);
final bookSettings = ref.watch(bookSettingsProvider(bookId));
final start = bookSettings.playerSettings.skipChapterStart;
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
// **************************************************************************
String _$skipStartEndHash() => r'f14f84be713bdaad463fcf790510cddeb2be7709';
String _$skipStartEndHash() => r'45572f40a098f081181e8b8bf9e4913e6e649cdc';
/// See also [SkipStartEnd].
@ProviderFor(SkipStartEnd)

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

@ -26,7 +26,7 @@ class SleepTimer extends _$SleepTimer {
var sleepTimer = core.SleepTimer(
duration: sleepTimerSettings.defaultDuration,
player: ref.watch(audioPlayerProvider),
player: ref.watch(absPlayerProvider),
);
ref.onDispose(sleepTimer.dispose);
return sleepTimer;
@ -45,7 +45,7 @@ class SleepTimer extends _$SleepTimer {
} else {
final timer = core.SleepTimer(
duration: resultingDuration,
player: ref.watch(audioPlayerProvider),
player: ref.watch(absPlayerProvider),
);
ref.onDispose(timer.dispose);
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
// **************************************************************************
String _$sleepTimerHash() => r'89ff64cd768deea9ed4ab103ddde918b3f96d705';
String _$sleepTimerHash() => r'417759e07a45e69af93bd9a1c78ac859d9abcf4b';
/// See also [SleepTimer].
@ProviderFor(SleepTimer)