A cross platform Audiobookshelf client for Android and iOS
Dart
Stuck position detection, Bluetooth skip controls, chapter sheet improvements, sleep timer rewind in active state
Nathan Poulsonb2480072a0dc
diff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dartindex 0ada2e40..1ef6f9a5 100644--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@ -206,6 +206,8 @@ class PlayerSettings {static Future<int> getSleepRewindSeconds() => _get('sleepRewindSeconds', 0);static Future<void> setSleepRewindSeconds(int seconds) => _set('sleepRewindSeconds', seconds);+ static Future<int> getSleepTimerTab() => _get('sleepTimerTab', 0);+ static Future<void> setSleepTimerTab(int tab) => _set('sleepTimerTab', tab);static Future<bool> getHideEbookOnly() => _get('hideEbookOnly', false);static Future<void> setHideEbookOnly(bool value) => _set('hideEbookOnly', value, notify: true);@@ -508,6 +510,8 @@ class AudioPlayerHandler extends BaseAudioHandler with SeekHandler {MediaAction.seek,MediaAction.seekForward,MediaAction.seekBackward,+ MediaAction.skipToNext,+ MediaAction.skipToPrevious,MediaAction.skipToQueueItem,},androidCompactActionIndices: compactIndices,@@ -735,6 +739,18 @@ class AudioPlayerHandler extends BaseAudioHandler with SeekHandler {}}+ @override+ Future<void> skipToNext() async {+ debugPrint('[Handler] skipToNext() - seeking forward');+ await fastForward();+ }++ @override+ Future<void> skipToPrevious() async {+ debugPrint('[Handler] skipToPrevious() - seeking back');+ await rewind();+ }+@overrideFuture<void> setSpeed(double speed) => _player.setSpeed(speed);@@ -1013,6 +1029,12 @@ class AudioPlayerService extends ChangeNotifier {int _streamRetryCount = 0;static const _maxStreamRetries = 3;bool _retryInProgress = false;+ // ── Stuck position detection (xHE-AAC/USAC iOS seek failures) ──+ Timer? _stuckCheckTimer;+ double _stuckCheckLastPosition = -1;+ int _stuckConsecutiveCount = 0; // consecutive checks with no advancement+ int _stuckReseekAttempts = 0; // how many re-seeks we've tried+ static const _maxStuckReseekAttempts = 2;// ── Multi-file track offset tracking ──// For ConcatenatingAudioSource, _player.position is track-relative.// We store cumulative start offsets so we can compute absolute book position.@@ -2048,6 +2070,9 @@ class AudioPlayerService extends ChangeNotifier {_eqSessionSub = null;_streamRetryCount = 0;_retryInProgress = false;+ _stuckCheckTimer?.cancel();+ _stuckCheckTimer = null;+ _resetStuckDetection();_noisyPause = false;notifyListeners();}@@ -2308,6 +2333,69 @@ class AudioPlayerService extends ChangeNotifier {debugPrint('[Player] Position stream error: $e');_attemptStreamRetry(e);});++ // Start stuck position detection (xHE-AAC/USAC iOS seek failures)+ _startStuckDetection();+ }++ /// Reset stuck detection state - call on manual seek or when position advances.+ void _resetStuckDetection() {+ _stuckConsecutiveCount = 0;+ _stuckReseekAttempts = 0;+ _stuckCheckLastPosition = -1;+ }++ /// Start a periodic timer that checks if playback position is advancing.+ /// If position is stuck for ~6 seconds while playing (2 consecutive checks),+ /// force a re-seek to the same position to kick the iOS decoder.+ void _startStuckDetection() {+ _stuckCheckTimer?.cancel();+ _resetStuckDetection();++ _stuckCheckTimer = Timer.periodic(const Duration(seconds: 3), (_) async {+ // Only check while actively playing+ if (_player == null || !_player!.playing) {+ _stuckCheckLastPosition = -1;+ _stuckConsecutiveCount = 0;+ return;+ }++ // Don't check during loading/buffering+ final state = _player!.processingState;+ if (state == ProcessingState.loading || state == ProcessingState.buffering) {+ return;+ }++ // Give up after max re-seek attempts to avoid infinite loops+ if (_stuckReseekAttempts >= _maxStuckReseekAttempts) return;++ final currentPos = position.inMilliseconds / 1000.0;+ if (currentPos <= 0) return;++ if (_stuckCheckLastPosition >= 0) {+ // Check if position has advanced (allow small tolerance for rounding)+ final advanced = (currentPos - _stuckCheckLastPosition).abs() > 0.1;+ if (advanced) {+ // Position is moving - reset counters+ _stuckConsecutiveCount = 0;+ _stuckReseekAttempts = 0;+ } else {+ // Position hasn't moved+ _stuckConsecutiveCount++;+ if (_stuckConsecutiveCount >= 2) {+ // Stuck for ~6 seconds - force re-seek+ _stuckReseekAttempts++;+ _stuckConsecutiveCount = 0;+ debugPrint('[Player] Stuck position detected - re-seeking '+ '(attempt $_stuckReseekAttempts/$_maxStuckReseekAttempts '+ 'at ${currentPos.toStringAsFixed(1)}s)');+ await _seekAbsolute(currentPos);+ }+ }+ }++ _stuckCheckLastPosition = currentPos;+ });}bool _isCompletingBook = false;@@ -2574,6 +2662,7 @@ class AudioPlayerService extends ChangeNotifier {}Future<void> seekTo(Duration pos) async {+ _resetStuckDetection();final from = position;await _seekAbsolute(pos.inMilliseconds / 1000.0);_logEvent(PlaybackEventType.seek,@@ -2584,6 +2673,7 @@ class AudioPlayerService extends ChangeNotifier {Future<void> skipForward([int seconds = 30]) async {if (_player == null) return;+ _resetStuckDetection();debugPrint('[Service] skipForward(${seconds}s) — playing=${_player!.playing}');final newPos = position + Duration(seconds: seconds);await _seekAbsolute(newPos.inMilliseconds / 1000.0);@@ -2595,6 +2685,7 @@ class AudioPlayerService extends ChangeNotifier {Future<void> skipBackward([int seconds = 10]) async {if (_player == null) return;+ _resetStuckDetection();final posS = position.inMilliseconds / 1000.0;final targetS = posS - seconds;@@ -2631,6 +2722,7 @@ class AudioPlayerService extends ChangeNotifier {Future<void> skipToNextChapter() async {if (_player == null || _chapters.isEmpty) return;+ _resetStuckDetection();final posS = position.inMilliseconds / 1000.0;for (int i = 0; i < _chapters.length; i++) {final start = (_chapters[i]['start'] as num?)?.toDouble() ?? 0;@@ -2646,6 +2738,7 @@ class AudioPlayerService extends ChangeNotifier {Future<void> skipToPreviousChapter() async {if (_player == null || _chapters.isEmpty) return;+ _resetStuckDetection();final posS = position.inMilliseconds / 1000.0;// If more than 3s into current chapter, go to start of current chapter// Otherwise go to previous chapter@@ -2755,6 +2848,7 @@ class AudioPlayerService extends ChangeNotifier {_syncSub?.cancel();_bgSaveTimer?.cancel();_pauseStopTimer?.cancel();+ _stuckCheckTimer?.cancel();_indexSub?.cancel();_player?.dispose();super.dispose();diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dartindex a9d4d75c..fc5c237b 100644--- a/lib/widgets/absorbing_card.dart+++ b/lib/widgets/absorbing_card.dart@@ -1258,14 +1258,14 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli? Icon(Icons.check_rounded, size: 16, color: cs.onSurfaceVariant.withValues(alpha: 0.4)): Text('${i + 1}', textAlign: TextAlign.center,style: tt.labelMedium?.copyWith(fontWeight: isCurrent ? FontWeight.w700 : FontWeight.w400, color: isCurrent ? accent : cs.onSurfaceVariant))),- title: Text(chTitle, maxLines: 1, overflow: TextOverflow.ellipsis,+ title: Text(chTitle,style: tt.bodyMedium?.copyWith(fontWeight: isCurrent ? FontWeight.w600 : FontWeight.w400,color: isCurrent ? cs.onSurface : isFinished ? cs.onSurface.withValues(alpha: 0.4) : cs.onSurface.withValues(alpha: 0.7))),trailing: Row(mainAxisSize: MainAxisSize.min, children: [Text('$pct%', style: tt.labelSmall?.copyWith(color: isCurrent ? accent.withValues(alpha: 0.7) : cs.onSurface.withValues(alpha: 0.24), fontSize: 10, fontWeight: FontWeight.w600)),const SizedBox(width: 8),- Text(_fmtDur(end - start), style: tt.labelSmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant)),+ Text(_fmtDur((end - start) / (_speedAdjustedTime && _isActive ? widget.player.speed : 1.0)), style: tt.labelSmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant)),]),onTap: _isPlaybackActive ? () {final seekDur = Duration(seconds: start.round());diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dartindex 79ff11d7..6d73e11e 100644--- a/lib/widgets/expanded_card.dart+++ b/lib/widgets/expanded_card.dart@@ -91,6 +91,7 @@ class _ExpandedCardState extends State<ExpandedCard> {String _buttonLayout = PlayerSettings.defaultButtonLayout;bool _rectangleCovers = false;bool _coverPlayButton = false;+ bool _speedAdjustedTime = true;// Our own route, captured for popUntil when modals are stacked above usRoute<dynamic>? _ownRoute;@@ -190,6 +191,9 @@ class _ExpandedCardState extends State<ExpandedCard> {PlayerSettings.getCoverPlayButton().then((v) {if (mounted && v != _coverPlayButton) setState(() => _coverPlayButton = v);});+ PlayerSettings.getSpeedAdjustedTime().then((v) {+ if (mounted && v != _speedAdjustedTime) setState(() => _speedAdjustedTime = v);+ });}@override@@ -1320,14 +1324,14 @@ class _ExpandedCardState extends State<ExpandedCard> {? Icon(Icons.check_rounded, size: 16, color: cs.onSurfaceVariant.withValues(alpha: 0.4)): Text('${i + 1}', textAlign: TextAlign.center,style: tt.labelMedium?.copyWith(fontWeight: isCurrent ? FontWeight.w700 : FontWeight.w400, color: isCurrent ? accent : cs.onSurfaceVariant))),- title: Text(chTitle, maxLines: 1, overflow: TextOverflow.ellipsis,+ title: Text(chTitle,style: tt.bodyMedium?.copyWith(fontWeight: isCurrent ? FontWeight.w600 : FontWeight.w400,color: isCurrent ? cs.onSurface : isFinished ? cs.onSurface.withValues(alpha: 0.4) : cs.onSurface.withValues(alpha: 0.7))),trailing: Row(mainAxisSize: MainAxisSize.min, children: [Text('$pct%', style: tt.labelSmall?.copyWith(color: isCurrent ? accent.withValues(alpha: 0.7) : cs.onSurface.withValues(alpha: 0.24), fontSize: 10, fontWeight: FontWeight.w600)),const SizedBox(width: 8),- Text(_fmtDur(end - start), style: tt.labelSmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant)),+ Text(_fmtDur((end - start) / (_speedAdjustedTime && _isActive ? widget.player.speed : 1.0)), style: tt.labelSmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant)),]),onTap: _isPlaybackActive ? () {final seekDur = Duration(seconds: start.round());diff --git a/lib/widgets/sleep_timer_sheet.dart b/lib/widgets/sleep_timer_sheet.dartindex bb28c601..9876a182 100644--- a/lib/widgets/sleep_timer_sheet.dart+++ b/lib/widgets/sleep_timer_sheet.dart@@ -42,6 +42,7 @@ class _SleepTimerSheetState extends State<SleepTimerSheet> {PlayerSettings.getSleepTimerMinutes(),PlayerSettings.getSleepTimerChapters(),PlayerSettings.getSleepRewindSeconds(),+ PlayerSettings.getSleepTimerTab(),]);if (mounted) setState(() {_shakeMode = results[0] as String;@@ -49,6 +50,7 @@ class _SleepTimerSheetState extends State<SleepTimerSheet> {_customMinutes = (results[2] as int).toDouble();_customChapters = results[3] as int;_sleepRewindSeconds = results[4] as int;+ _tabIndex = results[5] as int;});}@@ -196,6 +198,10 @@ class _SleepTimerSheetState extends State<SleepTimerSheet> {},)),+ const SizedBox(height: 12),+ Container(height: 0.5, color: cs.onSurface.withValues(alpha: 0.08)),+ const SizedBox(height: 12),+ _buildRewindSection(accent, tt),const SizedBox(height: 12),Container(height: 0.5, color: cs.onSurface.withValues(alpha: 0.08)),const SizedBox(height: 12),@@ -208,7 +214,10 @@ class _SleepTimerSheetState extends State<SleepTimerSheet> {final selected = _tabIndex == index;return Expanded(child: GestureDetector(- onTap: () => setState(() => _tabIndex = index),+ onTap: () {+ setState(() => _tabIndex = index);+ PlayerSettings.setSleepTimerTab(index);+ },child: AnimatedContainer(duration: const Duration(milliseconds: 200),padding: const EdgeInsets.symmetric(vertical: 10),