diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index 80f0aaeb55..363c7a459e 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.NonVisual
public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
: base(underlyingClock)
{
- GameplayAdjustments.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));
+ AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));
}
}
}
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index f0c7a398eb..6f57cfe2f7 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -265,7 +265,7 @@ namespace osu.Game.Rulesets.UI
private readonly AudioAdjustments gameplayAdjustments = new AudioAdjustments();
- public IAdjustableAudioComponent GameplayAdjustments => parentGameplayClock?.GameplayAdjustments ?? gameplayAdjustments;
+ public IAdjustableAudioComponent AdjustmentsFromMods => parentGameplayClock?.AdjustmentsFromMods ?? gameplayAdjustments;
#endregion
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 32d0e66d90..2d32bc7516 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -14,7 +14,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
///
public class MultiSpectatorPlayer : SpectatorPlayer
{
- public IAdjustableAudioComponent GameplayAdjustments => GameplayClockContainer.GameplayAdjustments;
+ ///
+ /// All adjustments applied to the clock of this which come from mods.
+ ///
+ public readonly AudioAdjustments ClockAdjustmentsFromMods = new AudioAdjustments();
private readonly SpectatorPlayerClock spectatorPlayerClock;
@@ -56,6 +59,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
}
protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
- => new GameplayClockContainer(spectatorPlayerClock);
+ {
+ var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock);
+ ClockAdjustmentsFromMods.BindAdjustments(gameplayClockContainer.AdjustmentsFromMods);
+ return gameplayClockContainer;
+ }
}
}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 617977bdde..42a946a023 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -187,10 +187,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
private void bindAudioAdjustments(PlayerArea first)
{
if (boundAdjustments != null)
- masterClockContainer.GameplayAdjustments.UnbindAdjustments(boundAdjustments);
+ masterClockContainer.AdjustmentsFromMods.UnbindAdjustments(boundAdjustments);
- boundAdjustments = first.GameplayAdjustments;
- masterClockContainer.GameplayAdjustments.BindAdjustments(boundAdjustments);
+ boundAdjustments = first.ClockAdjustmentsFromMods;
+ masterClockContainer.AdjustmentsFromMods.BindAdjustments(boundAdjustments);
}
private bool isCandidateAudioSource(SpectatorPlayerClock? clock)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 8ecb5adb76..585d464a2a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -43,9 +43,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
public readonly SpectatorPlayerClock SpectatorPlayerClock;
///
- /// The gameplay adjustments applied by the loaded in this area.
+ /// The clock adjustments applied by the loaded in this area.
///
- public readonly AudioAdjustments GameplayAdjustments = new AudioAdjustments();
+ public readonly AudioAdjustments ClockAdjustmentsFromMods = new AudioAdjustments();
///
/// The currently-loaded score.
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
var player = new MultiSpectatorPlayer(Score, SpectatorPlayerClock);
player.OnGameplayStarted += () => OnGameplayStarted?.Invoke();
- GameplayAdjustments.BindAdjustments(player.GameplayAdjustments);
+ ClockAdjustmentsFromMods.BindAdjustments(player.ClockAdjustmentsFromMods);
return player;
}));
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index e64c628fa0..35b79fd628 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play
///
public double StartTime { get; protected set; }
- public IAdjustableAudioComponent GameplayAdjustments { get; } = new AudioAdjustments();
+ public IAdjustableAudioComponent AdjustmentsFromMods { get; } = new AudioAdjustments();
private readonly BindableBool isPaused = new BindableBool(true);
diff --git a/osu.Game/Screens/Play/GameplayClockExtensions.cs b/osu.Game/Screens/Play/GameplayClockExtensions.cs
index ec77a94ce9..5e88b41080 100644
--- a/osu.Game/Screens/Play/GameplayClockExtensions.cs
+++ b/osu.Game/Screens/Play/GameplayClockExtensions.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Screens.Play
double rate = clock.Rate == 0 ? 1 : Math.Sign(clock.Rate);
return rate
- * clock.GameplayAdjustments.AggregateFrequency.Value
- * clock.GameplayAdjustments.AggregateTempo.Value;
+ * clock.AdjustmentsFromMods.AggregateFrequency.Value
+ * clock.AdjustmentsFromMods.AggregateTempo.Value;
}
}
}
diff --git a/osu.Game/Screens/Play/IGameplayClock.cs b/osu.Game/Screens/Play/IGameplayClock.cs
index c58d2dbcac..83ba5f3474 100644
--- a/osu.Game/Screens/Play/IGameplayClock.cs
+++ b/osu.Game/Screens/Play/IGameplayClock.cs
@@ -19,9 +19,9 @@ namespace osu.Game.Screens.Play
double StartTime { get; }
///
- /// All adjustments applied to this clock which come from gameplay or mods.
+ /// All adjustments applied to this clock which come from mods.
///
- IAdjustableAudioComponent GameplayAdjustments { get; }
+ IAdjustableAudioComponent AdjustmentsFromMods { get; }
IBindable IsPaused { get; }
}
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 20a5c95605..047f25a111 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Play
musicController.ResetTrackAdjustments();
- track.BindAdjustments(GameplayAdjustments);
+ track.BindAdjustments(AdjustmentsFromMods);
track.AddAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
@@ -213,7 +213,7 @@ namespace osu.Game.Screens.Play
if (!speedAdjustmentsApplied)
return;
- track.UnbindAdjustments(GameplayAdjustments);
+ track.UnbindAdjustments(AdjustmentsFromMods);
track.RemoveAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e93502da13..1732c6533e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -997,7 +997,7 @@ namespace osu.Game.Screens.Play
mod.ApplyToHUD(HUDOverlay);
foreach (var mod in GameplayState.Mods.OfType())
- mod.ApplyToTrack(GameplayClockContainer.GameplayAdjustments);
+ mod.ApplyToTrack(GameplayClockContainer.AdjustmentsFromMods);
updateGameplayState();