This commit is contained in:
rang 2026-01-05 17:29:24 +08:00
parent 178f3fbdb1
commit 634ffaed8c
27 changed files with 648 additions and 1012 deletions

View file

@ -1,9 +1,6 @@
import 'package:audio_service/audio_service.dart';
import 'package:audio_session/audio_session.dart';
import 'package:collection/collection.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:just_audio/just_audio.dart';
import 'package:logging/logging.dart';
import 'package:just_audio/just_audio.dart' as audio;
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:shelfsdk/audiobookshelf_api.dart' as api;
import 'package:vaani/api/api_provider.dart';
@ -12,55 +9,52 @@ import 'package:vaani/db/available_boxes.dart';
import 'package:vaani/db/cache/cache_key.dart';
import 'package:vaani/features/downloads/providers/download_manager.dart';
import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
import 'package:vaani/features/player/core/abs_audio_handler.dart';
import 'package:vaani/features/player/core/abs_audio_player.dart' as core;
import 'package:vaani/features/player/core/abs_audio_player_platform.dart';
import 'package:vaani/features/player/core/abs_audio_player.dart'
show AbsAudioPlayer;
import 'package:vaani/features/settings/app_settings_provider.dart';
import 'package:vaani/shared/extensions/box.dart';
import 'package:vaani/shared/extensions/model_conversions.dart';
part 'abs_provider.g.dart';
final _logger = Logger('AbsPlayerProvider');
///
@Riverpod(keepAlive: true)
Future<AudioHandler> configurePlayer(Ref ref) async {
final player = ref.read(absPlayerProvider);
// for playing audio on windows, linux
// @Riverpod(keepAlive: true)
// Future<AudioHandler> configurePlayer(Ref ref) async {
// final player = ref.read(absPlayerProvider);
// // for playing audio on windows, linux
// for configuring how this app will interact with other audio apps
final session = await AudioSession.instance;
await session.configure(const AudioSessionConfiguration.speech());
// // for configuring how this app will interact with other audio apps
// final session = await AudioSession.instance;
// await session.configure(const AudioSessionConfiguration.speech());
final audioService = await AudioService.init(
builder: () => AbsAudioHandler(player),
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),
),
);
// final audioService = await AudioService.init(
// builder: () => AbsAudioHandler(player),
// 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),
// ),
// );
_logger.finer('created simple player');
return audioService;
}
// _logger.finer('created simple player');
// return audioService;
// }
// just_audio
@Riverpod(keepAlive: true)
core.AbsAudioPlayer audioPlayer(Ref ref) {
final player = AbsPlatformAudioPlayer();
// final player = AbsMpvAudioPlayer();
ref.onDispose(player.dispose);
return player;
}
// @Riverpod(keepAlive: true)
// core.AbsAudioPlayer audioPlayer(Ref ref) {
// final player = AbsPlatformAudioPlayer();
// // final player = AbsMpvAudioPlayer();
// ref.onDispose(player.dispose);
// return player;
// }
//
@riverpod
@ -69,129 +63,20 @@ bool playerActive(Ref ref) {
}
@Riverpod(keepAlive: true)
AudioPlayer simpleAudioPlayer(Ref ref) {
final player = AudioPlayer();
audio.AudioPlayer simpleAudioPlayer(Ref ref) {
final player = audio.AudioPlayer();
ref.onDispose(player.dispose);
return player;
}
@Riverpod(keepAlive: true)
class AbsAudioPlayer extends _$AbsAudioPlayer {
@override
AudioPlayer build() {
final audioPlayer = ref.watch(simpleAudioPlayerProvider);
return audioPlayer;
}
final offset = Duration(milliseconds: 10);
Future<void> load(
api.BookExpanded book, {
Duration? initialPosition,
bool play = true,
}) async {
final currentTrack = book.findTrackAtTime(initialPosition ?? Duration.zero);
final indexTrack = book.tracks.indexOf(currentTrack);
final positionInTrack = initialPosition != null
? initialPosition - currentTrack.startOffset
: null;
final api = ref.read(authenticatedApiProvider);
final downloadManager = ref.read(simpleDownloadManagerProvider);
print(downloadManager.basePath);
final libItem =
await ref.read(libraryItemProvider(book.libraryItemId).future);
final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
final bookSettings = ref.read(bookSettingsProvider(book.libraryItemId));
var bookPlayerSettings = bookSettings.playerSettings;
final start = bookSettings.playerSettings.skipChapterStart;
final end = bookSettings.playerSettings.skipChapterEnd;
final appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
final configurePlayerForEveryBook =
appPlayerSettings.configurePlayerForEveryBook;
List<AudioSource> audioSources =
start > Duration.zero || end > Duration.zero
? book.tracks
.map(
(track) => ClippingAudioSource(
child: AudioSource.uri(
_getUri(
track,
downloadedUris,
baseUrl: api.baseUrl,
token: api.token!,
),
),
start: start,
end: end > Duration.zero ? null : track.duration - end,
),
)
.toList()
: book.tracks
.map(
(track) => AudioSource.uri(
_getUri(
track,
downloadedUris,
baseUrl: api.baseUrl,
token: api.token!,
),
),
)
.toList();
await state
.setAudioSources(
audioSources,
preload: true,
initialIndex: indexTrack,
initialPosition: positionInTrack,
)
.catchError((error) {
_logger.shout('Error in setting audio source: $error');
return null;
});
// set the volume
await state.setVolume(
configurePlayerForEveryBook
? bookPlayerSettings.preferredDefaultVolume ??
appPlayerSettings.preferredDefaultVolume
: appPlayerSettings.preferredDefaultVolume,
);
// set the speed
await state.setSpeed(
configurePlayerForEveryBook
? bookPlayerSettings.preferredDefaultSpeed ??
appPlayerSettings.preferredDefaultSpeed
: appPlayerSettings.preferredDefaultSpeed,
);
if (play) await state.play();
}
Uri _getUri(
api.AudioTrack track,
List<Uri>? downloadedUris, {
required Uri baseUrl,
required String token,
}) {
// check if the track is in the downloadedUris
final uri = downloadedUris?.firstWhereOrNull(
(element) {
return element.pathSegments.last == track.metadata?.filename;
},
);
return uri ??
Uri.parse('${baseUrl.toString()}${track.contentUrl}?token=$token');
}
}
/// riverpod状态
@Riverpod(keepAlive: true)
class AbsPlayer extends _$AbsPlayer {
@override
core.AbsAudioPlayer build() {
final audioPlayer = ref.watch(audioPlayerProvider);
return audioPlayer;
AbsAudioPlayer build() {
final audioPlayer = ref.watch(simpleAudioPlayerProvider);
return AbsAudioPlayer(audioPlayer);
}
Future<void> load(
@ -246,10 +131,71 @@ class AbsPlayer extends _$AbsPlayer {
}
}
/// riverpod状态
// @Riverpod(keepAlive: true)
// class AbsPlayer extends _$AbsPlayer {
// @override
// core.AbsAudioPlayer build() {
// final audioPlayer = ref.watch(audioPlayerProvider);
// return audioPlayer;
// }
// Future<void> load(
// api.BookExpanded book, {
// Duration? initialPosition,
// bool play = true,
// }) async {
// if (state.book == book || state.book?.libraryItemId == book.libraryItemId) {
// state.playOrPause();
// return;
// }
// final api = ref.read(authenticatedApiProvider);
// final downloadManager = ref.read(simpleDownloadManagerProvider);
// print(downloadManager.basePath);
// final libItem =
// await ref.read(libraryItemProvider(book.libraryItemId).future);
// final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
// final bookSettings = ref.read(bookSettingsProvider(book.libraryItemId));
// var bookPlayerSettings = bookSettings.playerSettings;
// var appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
// var configurePlayerForEveryBook =
// appPlayerSettings.configurePlayerForEveryBook;
// await state.load(
// book,
// baseUrl: api.baseUrl,
// token: api.token!,
// initialPosition: initialPosition,
// downloadedUris: downloadedUris,
// start: bookSettings.playerSettings.skipChapterStart,
// end: bookSettings.playerSettings.skipChapterEnd,
// );
// // set the volume
// await state.setVolume(
// configurePlayerForEveryBook
// ? bookPlayerSettings.preferredDefaultVolume ??
// appPlayerSettings.preferredDefaultVolume
// : appPlayerSettings.preferredDefaultVolume,
// );
// // set the speed
// await state.setSpeed(
// configurePlayerForEveryBook
// ? bookPlayerSettings.preferredDefaultSpeed ??
// appPlayerSettings.preferredDefaultSpeed
// : appPlayerSettings.preferredDefaultSpeed,
// );
// if (play) await state.play();
// }
// }
@riverpod
class PlayerState extends _$PlayerState {
@override
core.AbsPlayerState build() {
audio.PlayerState build() {
final player = ref.read(absPlayerProvider);
player.playerStateStream.listen((playerState) {
if (playerState != state) {
@ -260,10 +206,10 @@ class PlayerState extends _$PlayerState {
}
bool isLoading(String itemId) {
final player = ref.read(absPlayerProvider);
return player.book?.libraryItemId == itemId &&
final book = ref.read(currentBookProvider);
return book?.libraryItemId == itemId &&
!state.playing &&
state.processingState == core.AbsProcessingState.loading;
state.processingState == audio.ProcessingState.loading;
}
bool isPlaying() {
@ -307,7 +253,7 @@ class CurrentBook extends _$CurrentBook {
Future<void> update(String libraryItemId, {bool play = true}) async {
if (state?.libraryItemId == libraryItemId) {
ref.read(audioPlayerProvider).playOrPause();
ref.read(absPlayerProvider).playOrPause();
return;
}
final book = await ref.read(libraryItemProvider(libraryItemId).future);

View file

@ -6,44 +6,11 @@ part of 'abs_provider.dart';
// RiverpodGenerator
// **************************************************************************
String _$configurePlayerHash() => r'7ac63b6c3a34c56f42be55bc7a4856dabaae1583';
String _$playerActiveHash() => r'86831758035aa69d74f42ebde0a19bf7ef830910';
///
///
/// Copied from [configurePlayer].
@ProviderFor(configurePlayer)
final configurePlayerProvider = FutureProvider<AudioHandler>.internal(
configurePlayer,
name: r'configurePlayerProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$configurePlayerHash,
dependencies: null,
allTransitiveDependencies: null,
);
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef ConfigurePlayerRef = FutureProviderRef<AudioHandler>;
String _$audioPlayerHash() => r'156f85effafdcd287db88e455e8f4f4d33c41a0e';
/// See also [audioPlayer].
@ProviderFor(audioPlayer)
final audioPlayerProvider = Provider<core.AbsAudioPlayer>.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<core.AbsAudioPlayer>;
String _$playerActiveHash() => r'86831758035aa69d74f42ebde0a19bf7ef830910';
/// See also [playerActive].
/// Copied from [playerActive].
@ProviderFor(playerActive)
final playerActiveProvider = AutoDisposeProvider<bool>.internal(
playerActive,
@ -57,11 +24,11 @@ final playerActiveProvider = AutoDisposeProvider<bool>.internal(
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef PlayerActiveRef = AutoDisposeProviderRef<bool>;
String _$simpleAudioPlayerHash() => r'4da667e3b7047003edd594f8a76700afb963aceb';
String _$simpleAudioPlayerHash() => r'99d84a750cf605ad036603320925f0ba7253930b';
/// See also [simpleAudioPlayer].
@ProviderFor(simpleAudioPlayer)
final simpleAudioPlayerProvider = Provider<AudioPlayer>.internal(
final simpleAudioPlayerProvider = Provider<audio.AudioPlayer>.internal(
simpleAudioPlayer,
name: r'simpleAudioPlayerProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
@ -73,7 +40,7 @@ final simpleAudioPlayerProvider = Provider<AudioPlayer>.internal(
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef SimpleAudioPlayerRef = ProviderRef<AudioPlayer>;
typedef SimpleAudioPlayerRef = ProviderRef<audio.AudioPlayer>;
String _$currentTimeHash() => r'3e7f99dbf48242a5fa0a4239a0f696535d0b4ac9';
/// Copied from Dart SDK
@ -242,30 +209,11 @@ final positionChapterProvider = AutoDisposeStreamProvider<Duration>.internal(
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef PositionChapterRef = AutoDisposeStreamProviderRef<Duration>;
String _$absAudioPlayerHash() => r'f595b5033eed9f4a4aa07c297c4a176955e6aab1';
String _$absPlayerHash() => r'370f576d3d3a2196d1a93f2046005c1a3298d994';
/// See also [AbsAudioPlayer].
@ProviderFor(AbsAudioPlayer)
final absAudioPlayerProvider =
NotifierProvider<AbsAudioPlayer, AudioPlayer>.internal(
AbsAudioPlayer.new,
name: r'absAudioPlayerProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$absAudioPlayerHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$AbsAudioPlayer = Notifier<AudioPlayer>;
String _$absPlayerHash() => r'e682fea03793a0370cb143602980d5c1e37396c7';
/// riverpod状态
///
/// Copied from [AbsPlayer].
/// See also [AbsPlayer].
@ProviderFor(AbsPlayer)
final absPlayerProvider =
NotifierProvider<AbsPlayer, core.AbsAudioPlayer>.internal(
final absPlayerProvider = NotifierProvider<AbsPlayer, AbsAudioPlayer>.internal(
AbsPlayer.new,
name: r'absPlayerProvider',
debugGetCreateSourceHash:
@ -274,13 +222,15 @@ final absPlayerProvider =
allTransitiveDependencies: null,
);
typedef _$AbsPlayer = Notifier<core.AbsAudioPlayer>;
String _$playerStateHash() => r'f195d2d13bcee0f91b862e669ab3549667d8dd2d';
typedef _$AbsPlayer = Notifier<AbsAudioPlayer>;
String _$playerStateHash() => r'eb79bd816714f721da1c4226d4447de5dc55fc5c';
/// See also [PlayerState].
/// riverpod状态
///
/// Copied from [PlayerState].
@ProviderFor(PlayerState)
final playerStateProvider =
AutoDisposeNotifierProvider<PlayerState, core.AbsPlayerState>.internal(
AutoDisposeNotifierProvider<PlayerState, audio.PlayerState>.internal(
PlayerState.new,
name: r'playerStateProvider',
debugGetCreateSourceHash:
@ -289,8 +239,8 @@ final playerStateProvider =
allTransitiveDependencies: null,
);
typedef _$PlayerState = AutoDisposeNotifier<core.AbsPlayerState>;
String _$currentBookHash() => r'714d7701508b6186598e13bc38c57c3fe644ae90';
typedef _$PlayerState = AutoDisposeNotifier<audio.PlayerState>;
String _$currentBookHash() => r'85de9041d356e214761b65bd1b7b74321d5a9221';
/// See also [CurrentBook].
@ProviderFor(CurrentBook)