From 6301111fa3c1d274c68766d3c1456ebd74d95138 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:15:42 +0900
Subject: [PATCH] Remove ClockToProcess, always process underlying clock

---
 osu.Game/Screens/Play/GameplayClock.cs         | 18 +++++++++---------
 .../Screens/Play/GameplayClockContainer.cs     |  4 +---
 .../Play/MasterGameplayClockContainer.cs       |  2 --
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index db4b5d300b..54aa395f5f 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public class GameplayClock : IFrameBasedClock
     {
-        private readonly IFrameBasedClock underlyingClock;
+        internal readonly IFrameBasedClock UnderlyingClock;
 
         public readonly BindableBool IsPaused = new BindableBool();
 
@@ -30,12 +30,12 @@ namespace osu.Game.Screens.Play
 
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
-            this.underlyingClock = underlyingClock;
+            UnderlyingClock = underlyingClock;
         }
 
-        public double CurrentTime => underlyingClock.CurrentTime;
+        public double CurrentTime => UnderlyingClock.CurrentTime;
 
-        public double Rate => underlyingClock.Rate;
+        public double Rate => UnderlyingClock.Rate;
 
         /// <summary>
         /// The rate of gameplay when playback is at 100%.
@@ -59,19 +59,19 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public bool IsRunning => underlyingClock.IsRunning;
+        public bool IsRunning => UnderlyingClock.IsRunning;
 
         public void ProcessFrame()
         {
             // intentionally not updating the underlying clock (handled externally).
         }
 
-        public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
+        public double ElapsedFrameTime => UnderlyingClock.ElapsedFrameTime;
 
-        public double FramesPerSecond => underlyingClock.FramesPerSecond;
+        public double FramesPerSecond => UnderlyingClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
+        public FrameTimeInfo TimeInfo => UnderlyingClock.TimeInfo;
 
-        public IClock Source => underlyingClock;
+        public IClock Source => UnderlyingClock;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d863f0094..b7dc55277f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -80,15 +80,13 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             if (!IsPaused.Value)
-                ClockToProcess.ProcessFrame();
+                GameplayClock.UnderlyingClock.ProcessFrame();
 
             base.Update();
         }
 
         protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
-        protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
-
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 83e21f3c1d..5eb82bf0fa 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -128,8 +128,6 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
-        protected override IFrameBasedClock ClockToProcess => userOffsetClock;
-
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source)
         {
             // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.