From 7084aeee0523af04c380ef1ee2cee143d18f2fcc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Sep 2022 23:22:38 +0900
Subject: [PATCH] Add method flow to reset applied adjustments

---
 osu.Game/Screens/Play/GameplayClockContainer.cs       | 4 +++-
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 7 +++++--
 osu.Game/Screens/Play/Player.cs                       | 9 ++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6de88d7ad0..490c2329ca 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -196,7 +196,9 @@ namespace osu.Game.Screens.Play
 
         void IAdjustableClock.Reset() => Reset();
 
-        public void ResetSpeedAdjustments() => throw new NotImplementedException();
+        public virtual void ResetSpeedAdjustments()
+        {
+        }
 
         double IAdjustableClock.Rate
         {
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 57e67e6e26..15e9a40fd3 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -238,11 +238,14 @@ namespace osu.Game.Screens.Play
         void IAdjustableAudioComponent.RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) =>
             track.RemoveAdjustment(type, adjustBindable);
 
-        public void RemoveAllAdjustments(AdjustableProperty type)
+        public override void ResetSpeedAdjustments()
         {
-            throw new NotImplementedException();
+            track.RemoveAllAdjustments(AdjustableProperty.Frequency);
+            track.RemoveAllAdjustments(AdjustableProperty.Tempo);
         }
 
+        public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
+
         public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
         public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4afd04c335..21a02fbe0b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -999,9 +999,12 @@ namespace osu.Game.Screens.Play
             // Our mods are local copies of the global mods so they need to be re-applied to the track.
             // This is done through the music controller (for now), because resetting speed adjustments on the beatmap track also removes adjustments provided by DrawableTrack.
             // Todo: In the future, player will receive in a track and will probably not have to worry about this...
-            musicController.ResetTrackAdjustments();
-            foreach (var mod in GameplayState.Mods.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(musicController.CurrentTrack);
+            if (GameplayClockContainer is IAdjustableAudioComponent adjustableClock)
+            {
+                GameplayClockContainer.ResetSpeedAdjustments();
+                foreach (var mod in GameplayState.Mods.OfType<IApplicableToTrack>())
+                    mod.ApplyToTrack(adjustableClock);
+            }
 
             updateGameplayState();