From 9dc806506e55ca13b39241b50e71a1b7da7a332b Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Sun, 14 Aug 2022 19:09:34 +0200
Subject: [PATCH] Make `ActionListener` and `KeysPerSecondCalculator` not rely
 on events to add timestamps

---
 .../Visual/Gameplay/TestSceneKeysPerSecond.cs | 13 +++++-----
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 11 +++++---
 .../KeysPerSecond/KeysPerSecondCalculator.cs  | 25 ++++++-------------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
index 5c1ca18dbc..ac7b7521c9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
@@ -61,10 +61,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 dependencyContainer!.Children = new Drawable[]
                 {
-                    calculator = new KeysPerSecondCalculator
-                    {
-                        Listener = listener = new ManualInputListener()
-                    },
+                    calculator = new KeysPerSecondCalculator(),
                     new DependencyProvidingContainer
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -77,6 +74,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         }
                     }
                 };
+                calculator!.Listener = listener = new ManualInputListener(calculator!);
             });
         }
 
@@ -208,9 +206,12 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class ManualInputListener : KeysPerSecondCalculator.InputListener
         {
-            public override event Action? OnNewInput;
+            public void AddInput() => Calculator.AddTimestamp();
 
-            public void AddInput() => OnNewInput?.Invoke();
+            public ManualInputListener(KeysPerSecondCalculator calculator)
+                : base(calculator)
+            {
+            }
         }
 
         private class MockFrameBasedClock : ManualClock, IFrameBasedClock
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 590a305f77..23580bc40a 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Rulesets.UI
         {
             if (calculator == null) return;
 
-            var listener = new ActionListener();
+            var listener = new ActionListener(calculator);
 
             KeyBindingContainer.Add(listener);
 
@@ -202,11 +202,9 @@ namespace osu.Game.Rulesets.UI
 
         public class ActionListener : KeysPerSecondCalculator.InputListener, IKeyBindingHandler<T>
         {
-            public override event Action OnNewInput;
-
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
-                OnNewInput?.Invoke();
+                Calculator.AddTimestamp();
 
                 return false;
             }
@@ -214,6 +212,11 @@ namespace osu.Game.Rulesets.UI
             public void OnReleased(KeyBindingReleaseEvent<T> e)
             {
             }
+
+            public ActionListener(KeysPerSecondCalculator calculator)
+                : base(calculator)
+            {
+            }
         }
 
         #endregion
diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
index ecc9c6ef86..20ab09e9cc 100644
--- a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
             {
                 onResetRequested?.Invoke();
                 listener = value;
-                listener.OnNewInput += addTimestamp;
             }
         }
 
@@ -43,12 +42,9 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
         {
             get
             {
-                if (gameplayClock != null)
+                if (gameplayClock?.TrueGameplayRate > 0)
                 {
-                    if (gameplayClock.TrueGameplayRate > 0)
-                    {
-                        baseRate = gameplayClock.TrueGameplayRate;
-                    }
+                    baseRate = gameplayClock.TrueGameplayRate;
                 }
 
                 return baseRate;
@@ -71,12 +67,9 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
         {
             timestamps.Clear();
             maxTime = double.NegativeInfinity;
-
-            if (listener != null)
-                listener.OnNewInput -= addTimestamp;
         }
 
-        private void addTimestamp()
+        public void AddTimestamp()
         {
             if (workingClock == null) return;
 
@@ -96,20 +89,16 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
             return relativeTime > 0 && relativeTime <= span;
         }
 
-        ~KeysPerSecondCalculator()
-        {
-            cleanUp();
-        }
-
         public abstract class InputListener : Component
         {
-            protected InputListener()
+            protected KeysPerSecondCalculator Calculator;
+
+            protected InputListener(KeysPerSecondCalculator calculator)
             {
                 RelativeSizeAxes = Axes.Both;
                 Depth = float.MinValue;
+                Calculator = calculator;
             }
-
-            public abstract event Action? OnNewInput;
         }
     }
 }