h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 05:02:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4156 from Aergwyn/correct-preview-loop

Browse Source 
Correctly loop from preview point in song select

Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
Dean Herbert 2019-03-29 12:16:48 +09:00 committed by GitHub
commit 8d770404c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Select/SongSelect.cs
View File

@ -414,7 +414,6 @@ namespace osu.Game.Screens.Select
{ {
Logger.Log($"beatmap changed from \"{Beatmap.Value.BeatmapInfo}\" to \"{beatmap}\""); Logger.Log($"beatmap changed from \"{Beatmap.Value.BeatmapInfo}\" to \"{beatmap}\"");
preview = beatmap?.BeatmapSetInfoID != Beatmap.Value?.BeatmapInfo.BeatmapSetInfoID;
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap.Value); Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap.Value);
if (beatmap != null) if (beatmap != null)
@ -426,7 +425,8 @@ namespace osu.Game.Screens.Select
} }
} }
if (this.IsCurrentScreen()) ensurePlayingSelected(preview); if (this.IsCurrentScreen())
ensurePlayingSelected();
UpdateBeatmap(Beatmap.Value); UpdateBeatmap(Beatmap.Value);
} }
} }
@ -577,17 +577,17 @@ namespace osu.Game.Screens.Select
beatmap.Track.Looping = true; beatmap.Track.Looping = true;
} }
private void ensurePlayingSelected(bool preview = false) private void ensurePlayingSelected(bool restart = false)
{ {
Track track = Beatmap.Value.Track; Track track = Beatmap.Value.Track;
if (!track.IsRunning) if (!track.IsRunning || restart)
{ {
// Ensure the track is added to the TrackManager, since it is removed after the player finishes the map. // Ensure the track is added to the TrackManager, since it is removed after the player finishes the map.
// Using AddItemToList rather than AddItem so that it doesn't attempt to register adjustment dependencies more than once. // Using AddItemToList rather than AddItem so that it doesn't attempt to register adjustment dependencies more than once.
Game.Audio.Track.AddItemToList(track); Game.Audio.Track.AddItemToList(track);
if (preview) track.Seek(Beatmap.Value.Metadata.PreviewTime); track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
track.Start(); track.Restart();
} }
} }