h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-31 23:52:55 +08:00
Code Issues Releases Wiki Activity

Rename trackManager to previewTrackManager

Browse Source
This commit is contained in:
Andrei Zavatski 2019-08-12 09:50:49 +03:00
parent 520924b440
commit 5b68a2f34a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
}; };
[Resolved] [Resolved]
private PreviewTrackManager trackManager { get; set; } private PreviewTrackManager previewTrackManager { get; set; }
public TestSceneMatchBeatmapPanel() public TestSceneMatchBeatmapPanel()
{ {
@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddStep("Select random beatmap", () => AddStep("Select random beatmap", () =>
{ {
Room.CurrentItem.Value = Room.Playlist[RNG.Next(Room.Playlist.Count)]; Room.CurrentItem.Value = Room.Playlist[RNG.Next(Room.Playlist.Count)];
trackManager.StopAnyPlaying(this); previewTrackManager.StopAnyPlaying(this);
}); });
} }

8
osu.Game/Screens/Multi/Match/MatchSubScreen.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Screens.Multi.Match
private BeatmapManager beatmapManager { get; set; } private BeatmapManager beatmapManager { get; set; }
[Resolved] [Resolved]
private PreviewTrackManager trackManager { get; set; } private PreviewTrackManager previewTrackManager { get; set; }
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private OsuGame game { get; set; } private OsuGame game { get; set; }
@ -188,7 +188,7 @@ namespace osu.Game.Screens.Multi.Match
Mods.Value = Array.Empty<Mod>(); Mods.Value = Array.Empty<Mod>();
trackManager.StopAnyPlaying(this); previewTrackManager.StopAnyPlaying(this);
return base.OnExiting(next); return base.OnExiting(next);
} }
@ -207,7 +207,7 @@ namespace osu.Game.Screens.Multi.Match
if (e.NewValue?.Ruleset != null) if (e.NewValue?.Ruleset != null)
Ruleset.Value = e.NewValue.Ruleset; Ruleset.Value = e.NewValue.Ruleset;
trackManager.StopAnyPlaying(this); previewTrackManager.StopAnyPlaying(this);
} }
/// <summary> /// <summary>
@ -233,7 +233,7 @@ namespace osu.Game.Screens.Multi.Match
private void onStart() private void onStart()
{ {
trackManager.StopAnyPlaying(this); previewTrackManager.StopAnyPlaying(this);
switch (type.Value) switch (type.Value)
{ {