mirror of
https://github.com/Dr-Blank/Vaani.git
synced 2026-02-16 22:39:34 +00:00
播放逻辑修改
This commit is contained in:
rang
parent
420438c0df
commit
50a27fdf67
33 changed files with 788 additions and 761 deletions
|
|
@ -1,5 +1,4 @@
|
|||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:logging/logging.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:shelfsdk/audiobookshelf_api.dart' as api;
|
||||
import 'package:vaani/api/api_provider.dart';
|
||||
|
|
@ -8,7 +7,7 @@ import 'package:vaani/shared/audio_player_mpv.dart';
|
|||
|
||||
part 'abs_provider.g.dart';
|
||||
|
||||
final _logger = Logger('AbsPlayerProvider');
|
||||
// final _logger = Logger('AbsPlayerProvider');
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class AbsAudioPlayer extends _$AbsAudioPlayer {
|
||||
|
|
@ -40,7 +39,7 @@ class AbsAudioPlayer extends _$AbsAudioPlayer {
|
|||
@riverpod
|
||||
class PlayerState extends _$PlayerState {
|
||||
@override
|
||||
core.PlayerState build() {
|
||||
core.AbsPlayerState build() {
|
||||
final player = ref.read(absAudioPlayerProvider);
|
||||
player.playerStateStream.listen((playerState) {
|
||||
if (playerState != state) {
|
||||
|
|
@ -49,6 +48,17 @@ class PlayerState extends _$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
|
||||
|
|
|
|||
|
|
@ -74,12 +74,12 @@ final absAudioPlayerProvider =
|
|||
);
|
||||
|
||||
typedef _$AbsAudioPlayer = Notifier<core.AbsAudioPlayer>;
|
||||
String _$playerStateHash() => r'ed07c487fdad5fd0e21dfd32a274eecc470e83a4';
|
||||
String _$playerStateHash() => r'6635671077b077f48dad173c4393462921de56f8';
|
||||
|
||||
/// See also [PlayerState].
|
||||
@ProviderFor(PlayerState)
|
||||
final playerStateProvider =
|
||||
AutoDisposeNotifierProvider<PlayerState, core.PlayerState>.internal(
|
||||
AutoDisposeNotifierProvider<PlayerState, core.AbsPlayerState>.internal(
|
||||
PlayerState.new,
|
||||
name: r'playerStateProvider',
|
||||
debugGetCreateSourceHash:
|
||||
|
|
@ -88,7 +88,7 @@ final playerStateProvider =
|
|||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$PlayerState = AutoDisposeNotifier<core.PlayerState>;
|
||||
typedef _$PlayerState = AutoDisposeNotifier<core.AbsPlayerState>;
|
||||
String _$currentBookHash() => r'40c24ad45aab37afc32e8e8383d6abbe19b714bc';
|
||||
|
||||
/// See also [CurrentBook].
|
||||
|
|
|
|||
|
|
@ -1,108 +1,108 @@
|
|||
import 'package:audio_service/audio_service.dart';
|
||||
import 'package:audio_session/audio_session.dart';
|
||||
// import 'package:just_audio_media_kit/just_audio_media_kit.dart';
|
||||
import 'package:riverpod/riverpod.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:vaani/features/player/core/audiobook_player.dart';
|
||||
// import 'package:audio_service/audio_service.dart';
|
||||
// import 'package:audio_session/audio_session.dart';
|
||||
// // import 'package:just_audio_media_kit/just_audio_media_kit.dart';
|
||||
// import 'package:riverpod/riverpod.dart';
|
||||
// import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
// import 'package:vaani/features/player/core/audiobook_player.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;
|
||||
}
|
||||
}
|
||||
// part 'audiobook_player.g.dart';
|
||||
|
||||
// @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
|
||||
// core.PlaybackSessionExpanded? build() {
|
||||
// return null;
|
||||
// }
|
||||
|
||||
// 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,
|
||||
// ),
|
||||
// ]);
|
||||
// AbsAudioHandler build() {
|
||||
// return ref.watch(audioHandlerInitProvider).requireValue;
|
||||
// }
|
||||
// }
|
||||
|
||||
class PlaybackSyncError implements Exception {
|
||||
String message;
|
||||
// // @Riverpod(keepAlive: true)
|
||||
// // 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
|
||||
String toString() {
|
||||
return 'PlaybackSyncError: $message';
|
||||
}
|
||||
}
|
||||
// // 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 {
|
||||
// String message;
|
||||
|
||||
// PlaybackSyncError([this.message = 'Error syncing playback']);
|
||||
|
||||
// @override
|
||||
// String toString() {
|
||||
// return 'PlaybackSyncError: $message';
|
||||
// }
|
||||
// }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:shelfsdk/audiobookshelf_api.dart' as core;
|
||||
import 'package:vaani/api/api_provider.dart';
|
||||
import 'package:vaani/api/library_item_provider.dart';
|
||||
import 'package:vaani/features/downloads/providers/download_manager.dart';
|
||||
import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
|
||||
import 'package:vaani/features/player/providers/audiobook_player.dart';
|
||||
import 'package:vaani/features/settings/app_settings_provider.dart';
|
||||
import 'package:vaani/globals.dart';
|
||||
// import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
// import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
// import 'package:shelfsdk/audiobookshelf_api.dart' as core;
|
||||
// import 'package:vaani/api/api_provider.dart';
|
||||
// import 'package:vaani/api/library_item_provider.dart';
|
||||
// import 'package:vaani/features/downloads/providers/download_manager.dart';
|
||||
// import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
|
||||
// import 'package:vaani/features/player/providers/audiobook_player.dart';
|
||||
// import 'package:vaani/features/settings/app_settings_provider.dart';
|
||||
// import 'package:vaani/globals.dart';
|
||||
|
||||
// part 'currently_playing_provider.g.dart';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,40 +1,40 @@
|
|||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:vaani/features/player/core/player_status.dart' as core;
|
||||
// import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
// 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)
|
||||
class PlayerStatus extends _$PlayerStatus {
|
||||
@override
|
||||
core.PlayerStatus build() {
|
||||
return core.PlayerStatus();
|
||||
}
|
||||
// @Riverpod(keepAlive: true)
|
||||
// class PlayerStatus extends _$PlayerStatus {
|
||||
// @override
|
||||
// core.PlayerStatus build() {
|
||||
// return core.PlayerStatus();
|
||||
// }
|
||||
|
||||
void setPlayStatus(core.PlayStatus playStatus) {
|
||||
state = state.copyWith(playStatus: playStatus);
|
||||
}
|
||||
// void setPlayStatus(core.PlayStatus playStatus) {
|
||||
// state = state.copyWith(playStatus: playStatus);
|
||||
// }
|
||||
|
||||
void setPlayStatusQuietly(core.PlayStatus playStatus) {
|
||||
// state.copyWith(quite: true);
|
||||
setPlayStatus(playStatus);
|
||||
// state.copyWith(quite: false);
|
||||
}
|
||||
// void setPlayStatusQuietly(core.PlayStatus playStatus) {
|
||||
// // state.copyWith(quite: true);
|
||||
// setPlayStatus(playStatus);
|
||||
// // state.copyWith(quite: false);
|
||||
// }
|
||||
|
||||
// 校验原值, 不相同则更新
|
||||
void setPlayStatusVerify(core.PlayStatus playStatus) {
|
||||
if (state.playStatus != playStatus) {
|
||||
setPlayStatus(playStatus);
|
||||
}
|
||||
}
|
||||
// // 校验原值, 不相同则更新
|
||||
// void setPlayStatusVerify(core.PlayStatus playStatus) {
|
||||
// if (state.playStatus != playStatus) {
|
||||
// setPlayStatus(playStatus);
|
||||
// }
|
||||
// }
|
||||
|
||||
void setLoading(String itemId) {
|
||||
state = state.copyWith(
|
||||
playStatus: core.PlayStatus.loading,
|
||||
itemId: itemId,
|
||||
);
|
||||
}
|
||||
// void setLoading(String itemId) {
|
||||
// state = state.copyWith(
|
||||
// playStatus: core.PlayStatus.loading,
|
||||
// itemId: itemId,
|
||||
// );
|
||||
// }
|
||||
|
||||
void setHidden() {
|
||||
state = state.copyWith(playStatus: core.PlayStatus.hidden);
|
||||
}
|
||||
}
|
||||
// void setHidden() {
|
||||
// state = state.copyWith(playStatus: core.PlayStatus.hidden);
|
||||
// }
|
||||
// }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Loading…
Add table
Add a link
Reference in a new issue