RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix restarting shuffled playlist.

This commit is contained in:
John Preston 2021-11-23 18:01:58 +04:00
parent 5cd339332c
commit 433169626b
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Telegram/SourceFiles/media/player/media_player_instance.cpp
View File

@ -796,8 +796,27 @@ void Instance::validateShuffleData(not_null<Data*> data) {
raw->nonPlayedIds.clear();
raw->playedIds.clear();
raw->indexInPlayedIds = 0;
} else if (raw->allLoaded || raw->nextSliceLifetime) {
} else if (raw->nextSliceLifetime) {
return;
} else if (raw->allLoaded) {
const auto universal = computeCurrentUniversalId(data);
if (!universal
|| (raw->indexInPlayedIds < raw->playedIds.size()
? (raw->playedIds[raw->indexInPlayedIds] == universal)
: ranges::contains(raw->nonPlayedIds, universal))) {
return;
}
// We started playing some track not from the tracks that are left.
// Start the whole playlist thing once again.
raw->playedIds.clear();
raw->indexInPlayedIds = 0;
if (ranges::contains(raw->playlist, universal)) {
raw->nonPlayedIds = raw->playlist;
} else {
raw->allLoaded = false;
raw->playlist.clear();
raw->nonPlayedIds.clear();
}
}
if (raw->scheduled) {
const auto count = data->playlistSlice