mirror of
https://github.com/Dr-Blank/Vaani.git
synced 2026-02-17 06:49:34 +00:00
完善新播放逻辑
This commit is contained in:
rang
parent
eb1955e5e6
commit
114c9761fd
30 changed files with 658 additions and 683 deletions
|
|
@ -1,6 +1,5 @@
|
|||
import 'package:audio_service/audio_service.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:just_audio/just_audio.dart';
|
||||
import 'package:just_audio_media_kit/just_audio_media_kit.dart';
|
||||
import 'package:riverpod/riverpod.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
|
@ -9,24 +8,55 @@ import 'package:vaani/api/api_provider.dart';
|
|||
import 'package:vaani/api/library_item_provider.dart';
|
||||
import 'package:vaani/features/downloads/providers/download_manager.dart';
|
||||
import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
|
||||
import 'package:vaani/features/playback_reporting/core/playback_reporter_session.dart'
|
||||
as core;
|
||||
import 'package:vaani/features/player/core/audiobook_player_session.dart';
|
||||
import 'package:vaani/features/player/providers/player_status_provider.dart';
|
||||
import 'package:vaani/globals.dart';
|
||||
import 'package:vaani/settings/app_settings_provider.dart';
|
||||
import 'package:vaani/shared/extensions/obfuscation.dart';
|
||||
|
||||
part 'session_provider.g.dart';
|
||||
|
||||
class SessionPlayer {
|
||||
late final AbsAudioHandler _audioService;
|
||||
core.PlaybackSessionExpanded? _session;
|
||||
Ref ref;
|
||||
SessionPlayer(this.ref);
|
||||
void setAudioService(AbsAudioHandler audioPlayer) {
|
||||
_audioService = audioPlayer;
|
||||
@Riverpod(keepAlive: true)
|
||||
Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
|
||||
// JustAudioMediaKit.ensureInitialized(windows: false);
|
||||
JustAudioMediaKit.ensureInitialized();
|
||||
final audioService = await AudioService.init(
|
||||
builder: () => AbsAudioHandler(ref),
|
||||
config: const AudioServiceConfig(
|
||||
androidNotificationChannelId: 'com.vaani.rang.channel.audio',
|
||||
androidNotificationChannelName: 'ABSPlayback',
|
||||
androidNotificationChannelDescription:
|
||||
'Needed to control audio from lock screen',
|
||||
androidNotificationOngoing: false,
|
||||
androidStopForegroundOnPause: false,
|
||||
androidNotificationIcon: 'drawable/ic_stat_logo',
|
||||
preloadArtwork: true,
|
||||
),
|
||||
);
|
||||
return audioService;
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class Player extends _$Player {
|
||||
@override
|
||||
AbsAudioHandler build() {
|
||||
return ref.watch(audioHandlerInitProvider).requireValue;
|
||||
}
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class Session extends _$Session {
|
||||
@override
|
||||
core.PlaybackSessionExpanded? build() {
|
||||
return null;
|
||||
}
|
||||
|
||||
Future<void> load(String id, String? episodeId) async {
|
||||
ref.read(sessionLoadingProvider(id).notifier).setLoading();
|
||||
final audioService = ref.read(playerProvider);
|
||||
await audioService.pause();
|
||||
ref.read(playerStatusProvider.notifier).setLoading(id);
|
||||
final api = ref.read(authenticatedApiProvider);
|
||||
final playBack = await api.items.play(
|
||||
libraryItemId: id,
|
||||
|
|
@ -52,7 +82,7 @@ class SessionPlayer {
|
|||
),
|
||||
responseErrorHandler: _responseErrorHandler,
|
||||
) as core.PlaybackSessionExpanded;
|
||||
|
||||
state = playBack;
|
||||
final downloadManager = ref.read(simpleDownloadManagerProvider);
|
||||
final libItem =
|
||||
await ref.read(libraryItemProvider(playBack.libraryItemId).future);
|
||||
|
|
@ -66,35 +96,29 @@ class SessionPlayer {
|
|||
appPlayerSettings.configurePlayerForEveryBook;
|
||||
|
||||
await Future.wait([
|
||||
_audioService.setSourceAudiobook(
|
||||
audioService.setSourceAudiobook(
|
||||
playBack,
|
||||
baseUrl: api.baseUrl,
|
||||
token: api.token!,
|
||||
downloadedUris: downloadedUris,
|
||||
),
|
||||
// set the volume
|
||||
_audioService.setVolume(
|
||||
audioService.setVolume(
|
||||
configurePlayerForEveryBook
|
||||
? bookPlayerSettings.preferredDefaultVolume ??
|
||||
appPlayerSettings.preferredDefaultVolume
|
||||
: appPlayerSettings.preferredDefaultVolume,
|
||||
),
|
||||
// set the speed
|
||||
_audioService.setSpeed(
|
||||
audioService.setSpeed(
|
||||
configurePlayerForEveryBook
|
||||
? bookPlayerSettings.preferredDefaultSpeed ??
|
||||
appPlayerSettings.preferredDefaultSpeed
|
||||
: appPlayerSettings.preferredDefaultSpeed,
|
||||
),
|
||||
]);
|
||||
_session = playBack;
|
||||
ref.read(sessionLoadingProvider(id).notifier).setLoaded();
|
||||
ref.notifyListeners();
|
||||
}
|
||||
|
||||
AbsAudioHandler get audioService => _audioService;
|
||||
core.PlaybackSession? get session => _session;
|
||||
|
||||
void _responseErrorHandler(http.Response response, [error]) {
|
||||
if (response.statusCode != 200) {
|
||||
appLogger.severe('Error with api: ${response.obfuscate()}, $error');
|
||||
|
|
@ -106,104 +130,48 @@ class SessionPlayer {
|
|||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class Player extends _$Player {
|
||||
class CurrentChapter extends _$CurrentChapter {
|
||||
@override
|
||||
AbsAudioHandler build() {
|
||||
final audioService = ref.watch(sessionProvider).audioService;
|
||||
// audioService.positionStream.listen((position){
|
||||
|
||||
// });
|
||||
return audioService;
|
||||
core.BookChapter? build() {
|
||||
final player = ref.watch(playerProvider);
|
||||
player.chapterStream.distinct().listen((chapter) {
|
||||
update(chapter);
|
||||
});
|
||||
return player.currentChapter;
|
||||
}
|
||||
|
||||
Future<void> togglePlayPause() => state.togglePlayPause();
|
||||
Future<void> play() => state.play();
|
||||
Future<void> pause() => state.pause();
|
||||
Future<void> seekInBook(Duration globalPosition) =>
|
||||
state.seekInBook(globalPosition);
|
||||
void update(core.BookChapter? chapter) {
|
||||
if (state != chapter) {
|
||||
state = chapter;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
SessionPlayer session(Ref ref) {
|
||||
return SessionPlayer(ref);
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class SessionLoading extends _$SessionLoading {
|
||||
class PlaybackReporter extends _$PlaybackReporter {
|
||||
@override
|
||||
bool build(String itemId) {
|
||||
return false;
|
||||
}
|
||||
Future<core.PlaybackReporter?> build() async {
|
||||
final session = ref.watch(sessionProvider);
|
||||
if (session == null) {
|
||||
return null;
|
||||
}
|
||||
final playerSettings = ref.watch(appSettingsProvider).playerSettings;
|
||||
final player = ref.watch(playerProvider);
|
||||
final api = ref.watch(authenticatedApiProvider);
|
||||
|
||||
setLoading() {
|
||||
state = true;
|
||||
}
|
||||
|
||||
setLoaded() {
|
||||
state = false;
|
||||
final reporter = core.PlaybackReporter(
|
||||
player,
|
||||
api,
|
||||
reportingInterval: playerSettings.playbackReportInterval,
|
||||
markCompleteWhenTimeLeft: playerSettings.markCompleteWhenTimeLeft,
|
||||
minimumPositionForReporting: playerSettings.minimumPositionForReporting,
|
||||
session: session,
|
||||
);
|
||||
ref.onDispose(reporter.dispose);
|
||||
return reporter;
|
||||
}
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class PlayState extends _$PlayState {
|
||||
@override
|
||||
PlayerState build() {
|
||||
return PlayerState(false, ProcessingState.idle);
|
||||
}
|
||||
|
||||
void setState(PlayerState playerState) {
|
||||
state = playerState;
|
||||
}
|
||||
}
|
||||
|
||||
@riverpod
|
||||
core.BookChapter? currentChapter(Ref ref) {
|
||||
return ref.watch(playerProvider.select((v) => v.currentChapter));
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
|
||||
// JustAudioMediaKit.ensureInitialized(windows: false);
|
||||
JustAudioMediaKit.ensureInitialized();
|
||||
final audioService = await AudioService.init(
|
||||
builder: () => AbsAudioHandler(ref),
|
||||
config: const AudioServiceConfig(
|
||||
androidNotificationChannelId: 'com.vaani.rang.channel.audio',
|
||||
androidNotificationChannelName: 'ABSPlayback',
|
||||
androidNotificationChannelDescription:
|
||||
'Needed to control audio from lock screen',
|
||||
androidNotificationOngoing: false,
|
||||
androidStopForegroundOnPause: false,
|
||||
androidNotificationIcon: 'drawable/ic_stat_logo',
|
||||
preloadArtwork: true,
|
||||
),
|
||||
);
|
||||
ref.read(sessionProvider).setAudioService(audioService);
|
||||
return audioService;
|
||||
}
|
||||
|
||||
// @Riverpod(keepAlive: true)
|
||||
// class PlaybackReporter extends _$PlaybackReporter {
|
||||
// @override
|
||||
// Future<core.PlaybackReporter> build() async {
|
||||
// final playerSettings = ref.watch(appSettingsProvider).playerSettings;
|
||||
// final player = ref.watch(playerProvider);
|
||||
// final session = ref.watch(sessionProvider.select((v) => v.session));
|
||||
// final api = ref.watch(authenticatedApiProvider);
|
||||
|
||||
// final reporter = core.PlaybackReporter(
|
||||
// player.player,
|
||||
// api,
|
||||
// reportingInterval: playerSettings.playbackReportInterval,
|
||||
// markCompleteWhenTimeLeft: playerSettings.markCompleteWhenTimeLeft,
|
||||
// minimumPositionForReporting: playerSettings.minimumPositionForReporting,
|
||||
// session: session,
|
||||
// );
|
||||
// ref.onDispose(reporter.dispose);
|
||||
// return reporter;
|
||||
// }
|
||||
// }
|
||||
|
||||
class PlaybackSyncError implements Exception {
|
||||
String message;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue