Skip to content

Fix to retain queue position #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drake7707 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix to retain queue position #155

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47ff4ae
Initial plan
Copilot Mar 15, 2026
865aa87
Fix queue position not retained after audio service is killed
Copilot Mar 15, 2026
1edb06e
Merge pull request #1 from drake7707/copilot/retain-queue-position
drake7707 Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions lib/service/audio_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class AudioPlayerHandler extends BaseAudioHandler
Future<void> stop() async {
// Save queue before stopping player to save player details
Logger.root.info('saving queue');
_saveQueueToFile();
await _saveQueueToFile();
Logger.root.info('stopping player');
await _player.stop();
await super.stop();
Expand Down Expand Up @@ -704,7 +704,19 @@ class AudioPlayerHandler extends BaseAudioHandler

//Export queue to JSON
Future _saveQueueToFile() async {
if (_player.currentIndex == 0 && queue.value.isEmpty) return;
// Snapshot all player state synchronously before any await so that a
// concurrent _player.stop() call (which resets currentIndex to null on
// the Android platform) cannot corrupt the values we write to disk.
final int? index = _player.currentIndex;
final List<MediaItem> currentQueue = queue.value;
final int positionMs = _player.position.inMilliseconds;
final QueueSource? currentQueueSource = queueSource;
final int loopModeIndex = LoopMode.values.indexOf(_player.loopMode);

// Skip saving when there is nothing meaningful to persist:
// index == null means the player is uninitialised; index == 0 with an
// empty queue means the player has been reset to its initial state.
if ((index ?? 0) == 0 && currentQueue.isEmpty) return;

String path = await _getQueueFilePath();
File f = File(path);
Expand All @@ -713,14 +725,14 @@ class AudioPlayerHandler extends BaseAudioHandler
f = await f.create();
}
Map data = {
'index': _player.currentIndex,
'queue': queue.value
'index': index,
'queue': currentQueue
.map<Map<String, dynamic>>(
(mi) => MediaItemConverter.mediaItemToMap(mi))
.toList(),
'position': _player.position.inMilliseconds,
'queueSource': (queueSource ?? QueueSource()).toJson(),
'loopMode': LoopMode.values.indexOf(_player.loopMode)
'position': positionMs,
'queueSource': (currentQueueSource ?? QueueSource()).toJson(),
'loopMode': loopModeIndex
};
await f.writeAsString(jsonEncode(data));
}
Expand Down