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

Make MusicController a required dependency of SongSelect

Browse Source
This commit is contained in:
Dean Herbert 2023-01-15 22:43:30 +09:00
parent f7af5a8115
commit 4cf4a66858
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ using osu.Framework.Input.Bindings;
using osu.Game.Collections; using osu.Game.Collections;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using System.Diagnostics; using System.Diagnostics;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osu.Game.Skinning; using osu.Game.Skinning;
@ -118,7 +119,7 @@ namespace osu.Game.Screens.Select
private IDisposable? modSelectOverlayRegistration; private IDisposable? modSelectOverlayRegistration;
[Resolved] [Resolved]
private MusicController? music { get; set; } private MusicController music { get; set; } = null!;
[Resolved] [Resolved]
internal IOverlayManager? OverlayManager { get; private set; } internal IOverlayManager? OverlayManager { get; private set; }
@ -616,7 +617,6 @@ namespace osu.Game.Screens.Select
{ {
// restart playback on returning to song select, regardless. // restart playback on returning to song select, regardless.
// not sure this should be a permanent thing (we may want to leave a user pause paused even on returning) // not sure this should be a permanent thing (we may want to leave a user pause paused even on returning)
Debug.Assert(music != null);
music.ResetTrackAdjustments(); music.ResetTrackAdjustments();
music.Play(requestedByUser: true); music.Play(requestedByUser: true);
} }
@ -692,7 +692,6 @@ namespace osu.Game.Screens.Select
ensureTrackLooping(Beatmap.Value, TrackChangeDirection.None); ensureTrackLooping(Beatmap.Value, TrackChangeDirection.None);
Debug.Assert(music != null);
music.TrackChanged += ensureTrackLooping; music.TrackChanged += ensureTrackLooping;
} }
@ -702,7 +701,6 @@ namespace osu.Game.Screens.Select
if (!isHandlingLooping) if (!isHandlingLooping)
return; return;
Debug.Assert(music != null);
music.CurrentTrack.Looping = isHandlingLooping = false; music.CurrentTrack.Looping = isHandlingLooping = false;
music.TrackChanged -= ensureTrackLooping; music.TrackChanged -= ensureTrackLooping;
@ -728,7 +726,7 @@ namespace osu.Game.Screens.Select
decoupledRuleset.UnbindAll(); decoupledRuleset.UnbindAll();
if (music != null) if (music.IsNotNull())
music.TrackChanged -= ensureTrackLooping; music.TrackChanged -= ensureTrackLooping;
modSelectOverlayRegistration?.Dispose(); modSelectOverlayRegistration?.Dispose();
@ -774,7 +772,6 @@ namespace osu.Game.Screens.Select
if (!ControlGlobalMusic) if (!ControlGlobalMusic)
return; return;
Debug.Assert(music != null);
ITrack track = music.CurrentTrack; ITrack track = music.CurrentTrack;
bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track; bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;