Skip to content

Avoid context specific songs playing in a row #6319

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid context specific songs playing in a row #6319

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
196ba7c
- add check to ensure the song has not been played yet in the current…
dylanlee-pr Aug 30, 2025
a9dca57
- using more standard syntax to see if this fixes build CI issue
dylanlee082 Aug 31, 2025
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
6 changes: 2 additions & 4 deletions src/general/Jukebox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,15 +557,13 @@ private void PlayNextTrackFromList(TrackList list, Func<int, AudioPlayer> getPla

if (random.NextFloat() <= Constants.CONTEXTUAL_ONLY_MUSIC_CHANCE)
{
var contextMusicOnly = list.GetTracksForContexts(activeContexts).Where(c => c.ExclusiveToContexts != null)
var contextMusicOnly = list.GetTracksForContexts(activeContexts)
.Where(c => c.ExclusiveToContexts != null && !c.PlayedOnce)
.ToArray();

if (contextMusicOnly.Length > 0)
{
tracks = contextMusicOnly;

// TODO: it would be nice to ensure that contextual track doesn't cause the same track to play in a row
// Currently it is way more likely as most contexts only have one track for them.
}
}

Expand Down