From 27b57947e4822e1e73757d434b8fa8640327f2eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Aug 2022 16:43:26 +0900
Subject: [PATCH] Rename `PlayerArea.GameplayClock` to `SpectatorPlayerClock`
for clarity
---
.../Multiplayer/TestSceneMultiSpectatorScreen.cs | 6 +++---
.../Multiplayer/Spectate/MultiSpectatorScreen.cs | 10 +++++-----
.../OnlinePlay/Multiplayer/Spectate/PlayerArea.cs | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index dce996696b..54e289055b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -473,13 +473,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
=> AddAssert($"{userId} {(muted ? "is" : "is not")} muted", () => getInstance(userId).Mute == muted);
private void assertRunning(int userId)
- => AddAssert($"{userId} clock running", () => getInstance(userId).GameplayClock.IsRunning);
+ => AddAssert($"{userId} clock running", () => getInstance(userId).SpectatorPlayerClock.IsRunning);
private void assertNotCatchingUp(int userId)
- => AddAssert($"{userId} in sync", () => !getInstance(userId).GameplayClock.IsCatchingUp);
+ => AddAssert($"{userId} in sync", () => !getInstance(userId).SpectatorPlayerClock.IsCatchingUp);
private void waitForCatchup(int userId)
- => AddUntilStep($"{userId} not catching up", () => !getInstance(userId).GameplayClock.IsCatchingUp);
+ => AddUntilStep($"{userId} not catching up", () => !getInstance(userId).SpectatorPlayerClock.IsCatchingUp);
private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index aa002a7da2..a42aa4ba93 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
}, _ =>
{
foreach (var instance in instances)
- leaderboard.AddClock(instance.UserId, instance.GameplayClock);
+ leaderboard.AddClock(instance.UserId, instance.SpectatorPlayerClock);
leaderboardFlow.Insert(0, leaderboard);
@@ -163,10 +163,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
{
base.Update();
- if (!isCandidateAudioSource(currentAudioSource?.GameplayClock))
+ if (!isCandidateAudioSource(currentAudioSource?.SpectatorPlayerClock))
{
- currentAudioSource = instances.Where(i => isCandidateAudioSource(i.GameplayClock))
- .OrderBy(i => Math.Abs(i.GameplayClock.CurrentTime - syncManager.CurrentMasterTime))
+ currentAudioSource = instances.Where(i => isCandidateAudioSource(i.SpectatorPlayerClock))
+ .OrderBy(i => Math.Abs(i.SpectatorPlayerClock.CurrentTime - syncManager.CurrentMasterTime))
.FirstOrDefault();
foreach (var instance in instances)
@@ -215,7 +215,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
var instance = instances.Single(i => i.UserId == userId);
instance.FadeColour(colours.Gray4, 400, Easing.OutQuint);
- syncManager.RemoveManagedClock(instance.GameplayClock);
+ syncManager.RemoveManagedClock(instance.SpectatorPlayerClock);
}
public override bool OnBackButton()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index a1fbdc10de..36f6631ebf 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -38,9 +38,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
public readonly int UserId;
/// <summary>
- /// The <see cref="SpectatorPlayerClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
+ /// The <see cref="Spectate.SpectatorPlayerClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
/// </summary>
- public readonly SpectatorPlayerClock GameplayClock;
+ public readonly SpectatorPlayerClock SpectatorPlayerClock;
/// <summary>
/// The currently-loaded score.
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
public PlayerArea(int userId, SpectatorPlayerClock clock)
{
UserId = userId;
- GameplayClock = clock;
+ SpectatorPlayerClock = clock;
RelativeSizeAxes = Axes.Both;
Masking = true;
@@ -95,7 +95,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
stack.Push(new MultiSpectatorPlayerLoader(Score, () =>
{
- var player = new MultiSpectatorPlayer(Score, GameplayClock);
+ var player = new MultiSpectatorPlayer(Score, SpectatorPlayerClock);
player.OnGameplayStarted += () => OnGameplayStarted?.Invoke();
return player;
}));