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

Allow preparing preview point without looping

Browse Source
This commit is contained in:
Dean Herbert
2022-08-17 13:20:24 +09:00
Unverified
parent f30d68cd4e
commit 37799e3b31
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Beatmaps/IWorkingBeatmap.cs
+1 -1
View File
@@ -134,6 +134,6 @@ namespace osu.Game.Beatmaps
/// <summary>
/// Reads the correct track restart point from beatmap metadata and sets looping to enabled.
/// </summary>
void PrepareTrackForPreviewLooping();
void PrepareTrackForPreview(bool looping);
}
}
osu.Game/Beatmaps/WorkingBeatmap.cs
+2 -2
View File
@@ -110,9 +110,9 @@ namespace osu.Game.Beatmaps
public Track LoadTrack() => track = GetBeatmapTrack() ?? GetVirtualTrack(1000);
public void PrepareTrackForPreviewLooping()
public void PrepareTrackForPreview(bool looping)
{
Track.Looping = true;
Track.Looping = looping;
Track.RestartPoint = Metadata.PreviewTime;
if (Track.RestartPoint == -1)
osu.Game/Screens/Menu/MainMenu.cs
+1 -1
View File
@@ -192,7 +192,7 @@ namespace osu.Game.Screens.Menu
// presume the track is the current beatmap's track. not sure how correct this assumption is but it has worked until now.
if (!track.IsRunning)
{
Beatmap.Value.PrepareTrackForPreviewLooping();
Beatmap.Value.PrepareTrackForPreview(false);
track.Restart();
}
}
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+1 -1
View File
@@ -485,7 +485,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
if (track != null)
{
Beatmap.Value.PrepareTrackForPreviewLooping();
Beatmap.Value.PrepareTrackForPreview(true);
music?.EnsurePlayingSomething();
}
}
osu.Game/Screens/Select/SongSelect.cs
+1 -1
View File
@@ -683,7 +683,7 @@ namespace osu.Game.Screens.Select
}
private void ensureTrackLooping(IWorkingBeatmap beatmap, TrackChangeDirection changeDirection)
=> beatmap.PrepareTrackForPreviewLooping();
=> beatmap.PrepareTrackForPreview(true);
public override bool OnBackButton()
{