Skip to content

Tidy up track switching handling #37230

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

Merged
peppy merged 2 commits into from
Apr 7, 2026
+8 −15
Merged

Tidy up track switching handling #37230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff0df15
Tidy up track switching handling
peppy Apr 7, 2026
3f1faaa
Remove bork
peppy Apr 7, 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
23 changes: 8 additions & 15 deletions osu.Game/Overlays/MusicController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using osu.Framework.Audio;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
using osu.Framework.Development;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Audio;
using osu.Framework.Graphics.Containers;
Expand Down Expand Up @@ -513,30 +514,22 @@ private void changeBeatmap(WorkingBeatmap newWorking)

private void changeTrack()
{
Debug.Assert(ThreadSafety.IsUpdateThread);

const double track_fade_in_time = 220;
const double track_fade_out_time = 150;

var queuedTrack = getQueuedTrack();

var lastTrack = CurrentTrack;

lastTrack.Completed -= onTrackCompleted;
lastTrack.VolumeTo(0, track_fade_out_time, Easing.Out).Expire();

CurrentTrack = queuedTrack;

lastTrack.VolumeTo(0, track_fade_out_time, Easing.Out).Expire();

if (queuedTrack == CurrentTrack)
{
queuedTrack.Volume.Value = 0;
AddInternal(queuedTrack);
queuedTrack.Delay(DELAY_BEFORE_FADE).VolumeTo(1, track_fade_in_time);
}
else
{
// If the track has changed since the call to changeTrack, it is safe to dispose the
// queued track rather than consume it.
queuedTrack.Dispose();
}
queuedTrack.Volume.Value = 0;
AddInternal(queuedTrack);
queuedTrack.Delay(DELAY_BEFORE_FADE).VolumeTo(1, track_fade_in_time);
}

private DrawableTrack getQueuedTrack()
Expand Down
Loading