RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-11 16:49:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify logic and add test coverage for remaining case

Browse Source
This commit is contained in:
Dean Herbert 2019-10-10 20:12:47 +09:00
parent a819a64036
commit 5eba33e876
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
View File

@ -92,8 +92,9 @@ namespace osu.Game.Tests.Visual.Menus
exitViaEscapeAndConfirm(); exitViaEscapeAndConfirm();
} }
[Test] [TestCase(true)]
public void TestSongContinuesAfterExitPlayer() [TestCase(false)]
public void TestSongContinuesAfterExitPlayer(bool withUserPause)
{ {
Player player = null; Player player = null;
@ -106,6 +107,9 @@ namespace osu.Game.Tests.Visual.Menus
AddUntilStep("wait for selected", () => !game.Beatmap.IsDefault); AddUntilStep("wait for selected", () => !game.Beatmap.IsDefault);
if (withUserPause)
AddStep("pause", () => game.Dependencies.Get<MusicController>().Stop());
AddStep("press enter", () => pressAndRelease(Key.Enter)); AddStep("press enter", () => pressAndRelease(Key.Enter));
AddUntilStep("wait for player", () => (player = game.ScreenStack.CurrentScreen as Player) != null); AddUntilStep("wait for player", () => (player = game.ScreenStack.CurrentScreen as Player) != null);

6
osu.Game/Overlays/MusicController.cs
View File

@ -129,11 +129,9 @@ namespace osu.Game.Overlays
{ {
var track = current?.Track; var track = current?.Track;
if (track.IsRunning) IsUserPaused = true;
{ if (track?.IsRunning == true)
IsUserPaused = true;
track.Stop(); track.Stop();
}
} }
/// <summary> /// <summary>

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

@ -490,7 +490,9 @@ namespace osu.Game.Screens.Select
if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending) if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
{ {
UpdateBeatmap(Beatmap.Value); UpdateBeatmap(Beatmap.Value);
ensurePlayingSelected(false);
// restart playback on returning to song select, regardless.
music?.Play();
} }
base.OnResuming(last); base.OnResuming(last);
@ -587,8 +589,7 @@ namespace osu.Game.Screens.Select
/// Ensures some music is playing for the current track. /// Ensures some music is playing for the current track.
/// Will resume playback from a manual user pause if the track has changed. /// Will resume playback from a manual user pause if the track has changed.
/// </summary> /// </summary>
/// <param name="fromPreviewPoint">Whether to restart from the preview point, rather than resuming from previous location.</param> private void ensurePlayingSelected()
private void ensurePlayingSelected(bool fromPreviewPoint = true)
{ {
Track track = Beatmap.Value.Track; Track track = Beatmap.Value.Track;
@ -597,7 +598,7 @@ namespace osu.Game.Screens.Select
track.RestartPoint = Beatmap.Value.Metadata.PreviewTime; track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack)) if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack))
music?.Play(fromPreviewPoint); music?.Play(true);
lastTrack.SetTarget(track); lastTrack.SetTarget(track);
} }