A cross platform Audiobookshelf client for Android and iOS
Dart
Fix casting for multi-track books and keep cast alive when phone locked
Nathan Poulson039e67b1fe47
diff --git a/lib/screens/app_shell.dart b/lib/screens/app_shell.dartindex dec2949b..883a7fbc 100644--- a/lib/screens/app_shell.dart+++ b/lib/screens/app_shell.dart@@ -51,7 +51,7 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver {String? _lastItemId;bool _expandedIsOpen = false;bool _wasCasting = false;- Timer? _castDisconnectTimer;+// Lazily build tabs so startup on Absorbing does not initialize Home/Library// work until the user actually visits those tabs.@@ -209,20 +209,9 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver {@overridevoid didChangeAppLifecycleState(AppLifecycleState state) {if (state == AppLifecycleState.resumed) {- _castDisconnectTimer?.cancel();- _castDisconnectTimer = null;_refreshDataForTab(_currentIndex);// Check auto sleep in case we resumed into the windowSleepTimerService().checkAutoSleep();- } else if (state == AppLifecycleState.paused) {- // Disconnect cast if app doesn't resume (e.g. swiped away).- // detached doesn't fire reliably on Android swipe-away.- final cast = ChromecastService();- if (cast.isConnected) {- _castDisconnectTimer = Timer(const Duration(seconds: 3), () {- cast.disconnect();- });- }} else if (state == AppLifecycleState.detached) {final cast = ChromecastService();if (cast.isConnected) cast.disconnect();diff --git a/lib/services/chromecast_service.dart b/lib/services/chromecast_service.dartindex f33eb8be..474256b3 100644--- a/lib/services/chromecast_service.dart+++ b/lib/services/chromecast_service.dart@@ -29,6 +29,12 @@ class ChromecastService extends ChangeNotifier {Duration _castPosition = Duration.zero;String? _connectedDeviceName;+ // Multi-track fallback state (when queueLoadItems fails)+ List<dynamic>? _fallbackTracks;+ List<double>? _fallbackOffsets;+ int _fallbackTrackIdx = -1;+ bool _isAdvancingTrack = false;+String? get castingItemId => _castingItemId;String? get castingEpisodeId => _castingEpisodeId;String? get castingTitle => _castingTitle;@@ -118,6 +124,7 @@ class ChromecastService extends ChangeNotifier {_castingDuration = 0;_castingChapters = [];_castPosition = Duration.zero;+ _fallbackTracks = null; _fallbackOffsets = null; _fallbackTrackIdx = -1;_mediaStatusSub?.cancel();_positionSub?.cancel();_syncTimer?.cancel();@@ -141,12 +148,15 @@ class ChromecastService extends ChangeNotifier {}}- // Detect playback completion: was playing/buffering → now idle, position near end+ // Detect playback completion: was playing/buffering → now idleif (_playbackState == CastPlaybackState.idle &&(prev == CastPlaybackState.playing || prev == CastPlaybackState.buffering) &&- _castingItemId != null && _castingDuration > 0) {+ _castingItemId != null && _castingDuration > 0 && !_isAdvancingTrack) {final pos = _castPosition.inMilliseconds / 1000.0;- if (pos >= _castingDuration - 5) {+ // In fallback mode, check if this is a track end (not book end)+ if (_fallbackTracks != null && _fallbackTrackIdx < _fallbackTracks!.length - 1) {+ _advanceToNextTrack();+ } else if (pos >= _castingDuration - 5) {_onCastPlaybackComplete();}}@@ -158,7 +168,15 @@ class ChromecastService extends ChangeNotifier {void _listenToPosition() {_positionSub?.cancel();_positionSub = GoogleCastRemoteMediaClient.instance.playerPositionStream?.listen((pos) {- if (pos != null) _castPosition = pos;+ if (pos != null) {+ // In fallback mode, translate track-local position to book position+ if (_fallbackOffsets != null && _fallbackTrackIdx >= 0 && _fallbackTrackIdx < _fallbackOffsets!.length) {+ final offsetMs = (_fallbackOffsets![_fallbackTrackIdx] * 1000).round();+ _castPosition = Duration(milliseconds: offsetMs + pos.inMilliseconds);+ } else {+ _castPosition = pos;+ }+ }});_syncTimer?.cancel();_syncTimer = Timer.periodic(const Duration(seconds: 15), (_) {@@ -373,25 +391,99 @@ class ChromecastService extends ChangeNotifier {));}debugPrint('[Cast] Calling queueLoadItems with ${items.length} items...');- await GoogleCastRemoteMediaClient.instance.queueLoadItems(items);- debugPrint('[Cast] ✓ queueLoadItems completed');-- if (localStart > 0.5) {- await Future.delayed(const Duration(milliseconds: 500));- debugPrint('[Cast] Seeking to $localStart...');- await GoogleCastRemoteMediaClient.instance.seek(- GoogleCastMediaSeekOption(position: Duration(milliseconds: (localStart * 1000).round())),- );- debugPrint('[Cast] ✓ Seek completed');+ try {+ await GoogleCastRemoteMediaClient.instance.queueLoadItems(items);+ debugPrint('[Cast] ✓ queueLoadItems completed');++ if (localStart > 0.5) {+ await Future.delayed(const Duration(milliseconds: 500));+ debugPrint('[Cast] Seeking to $localStart...');+ await GoogleCastRemoteMediaClient.instance.seek(+ GoogleCastMediaSeekOption(position: Duration(milliseconds: (localStart * 1000).round())),+ );+ debugPrint('[Cast] ✓ Seek completed');+ }+ _castPosition = Duration(milliseconds: (startTime * 1000).round());+ return true;+ } catch (queueErr) {+ debugPrint('[Cast] queueLoadItems failed, falling back to single-track loadMedia: $queueErr');+ }++ // Fallback: load the correct track via loadMedia instead of queue+ int trackIdx = 0;+ for (int i = 0; i < offsets.length - 1; i++) {+ if (startTime < offsets[i + 1] || i == offsets.length - 2) {+ trackIdx = i;+ break;+ }}+ // Store fallback state for auto-advance+ _fallbackTracks = tracks;+ _fallbackOffsets = offsets;+ _fallbackTrackIdx = trackIdx;++ await _loadFallbackTrack(api, tracks, offsets, trackIdx, localStart, title, author, coverUrl, totalDuration);_castPosition = Duration(milliseconds: (startTime * 1000).round());return true;} catch (e, st) {- debugPrint('[Cast] Queue error: $e\n$st');+ debugPrint('[Cast] Cast load error: $e\n$st');_playbackState = CastPlaybackState.idle; notifyListeners(); return false;}}+ Future<void> _loadFallbackTrack(ApiService api, List<dynamic> tracks,+ List<double> offsets, int trackIdx, double localStart,+ String title, String author, String? coverUrl, double totalDuration) async {+ final m = tracks[trackIdx] as Map<String, dynamic>;+ final fallbackUrl = api.buildTrackUrl(m['contentUrl'] as String? ?? '');+ final trackDur = (m['duration'] as num?)?.toDouble() ?? totalDuration;+ debugPrint('[Cast] Fallback: loading track $trackIdx/${tracks.length} at ${localStart}s');+ await GoogleCastRemoteMediaClient.instance.loadMedia(+ GoogleCastMediaInformation(+ contentId: fallbackUrl,+ streamType: CastMediaStreamType.buffered,+ contentUrl: Uri.parse(fallbackUrl),+ contentType: _contentType(fallbackUrl),+ metadata: GoogleCastGenericMediaMetadata(+ title: title,+ subtitle: '$author · Track ${trackIdx + 1} of ${tracks.length}',+ images: coverUrl != null ? [GoogleCastImage(url: Uri.parse(coverUrl), height: 400, width: 400)] : null,+ ),+ duration: Duration(seconds: trackDur.round()),+ ),+ autoPlay: true,+ playPosition: Duration(milliseconds: (localStart * 1000).round()),+ );+ debugPrint('[Cast] ✓ Fallback loadMedia completed (track $trackIdx)');+ }++ /// Auto-advance to next track when in fallback single-track mode+ Future<void> _advanceToNextTrack() async {+ if (_isAdvancingTrack || _fallbackTracks == null || _api == null) return;+ final nextIdx = _fallbackTrackIdx + 1;+ if (nextIdx >= _fallbackTracks!.length) return; // last track — real completion+ _isAdvancingTrack = true;+ _fallbackTrackIdx = nextIdx;+ debugPrint('[Cast] Auto-advancing to track $nextIdx/${_fallbackTracks!.length}');+ try {+ await _loadFallbackTrack(+ _api!, _fallbackTracks!, _fallbackOffsets!, nextIdx, 0,+ _castingTitle ?? '', _castingAuthor ?? '', _castingCoverUrl, _castingDuration,+ );+ _castPosition = Duration(milliseconds: (_fallbackOffsets![nextIdx] * 1000).round());+ // Re-apply speed+ if ((_castSpeed - 1.0).abs() > 0.01) {+ await Future.delayed(const Duration(milliseconds: 300));+ try {+ await GoogleCastRemoteMediaClient.instance.setPlaybackRate(_castSpeed);+ } catch (_) {}+ }+ } catch (e) {+ debugPrint('[Cast] Auto-advance error: $e');+ }+ _isAdvancingTrack = false;+ }+String _contentType(String url) {final l = url.toLowerCase();if (l.contains('.m4b') || l.contains('.m4a') || l.contains('.aac')) return 'audio/mp4';@@ -498,6 +590,7 @@ class ChromecastService extends ChangeNotifier {_playbackState = CastPlaybackState.idle;_castingItemId = _castingEpisodeId = _castingTitle = _castingAuthor = _castingCoverUrl = null;_castingDuration = 0; _castingChapters = [];+ _fallbackTracks = null; _fallbackOffsets = null; _fallbackTrackIdx = -1;notifyListeners();}diff --git a/lib/widgets/book_detail_sheet.dart b/lib/widgets/book_detail_sheet.dartindex 1b6f272a..0b1aff7b 100644--- a/lib/widgets/book_detail_sheet.dart+++ b/lib/widgets/book_detail_sheet.dart@@ -396,6 +396,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {if (year.isNotEmpty) _chip(Icons.calendar_today_rounded, year),_chip(Icons.schedule_rounded, _fmtDur(duration)),if (chapters.isNotEmpty) _chip(Icons.list_rounded, '${chapters.length} chapters'),+ ..._audioInfoChips(media),if (publisher.isNotEmpty) _chip(Icons.business_rounded, publisher),...genres.take(3).map((g) => _chip(Icons.tag_rounded, g)),if (progressData?['startedAt'] is num)@@ -490,6 +491,18 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {Text(label, style: TextStyle(color: cs.onSurfaceVariant, fontSize: 12, fontWeight: FontWeight.w500))])));}+ List<Widget> _audioInfoChips(Map<String, dynamic> media) {+ final audioFiles = media['audioFiles'] as List<dynamic>?;+ if (audioFiles == null || audioFiles.isEmpty) return [];+ final first = audioFiles.first as Map<String, dynamic>;+ final codec = (first['codec'] as String?)?.toUpperCase();+ final bitRate = (first['bitRate'] as num?)?.toInt();+ return [+ if (codec != null && codec.isNotEmpty) _chip(Icons.audio_file_rounded, codec),+ if (bitRate != null && bitRate > 0) _chip(Icons.speed_rounded, '${(bitRate / 1000).round()} kbps'),+ ];+ }+Widget _chip(IconData icon, String text) {final cs = Theme.of(context).colorScheme;return Container(diff --git a/pubspec.yaml b/pubspec.yamlindex 8308b9ea..e742fc6f 100644--- a/pubspec.yaml+++ b/pubspec.yaml@@ -1,7 +1,7 @@name: absorbdescription: A Material 3 Audiobookshelf client for Android.publish_to: 'none'-version: 1.8.0+34+version: 1.8.2+35environment:sdk: '>=3.1.0 <4.0.0'