From 12d6d6793cd5eba002c0b39a976dc15c8c8955b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Aug 2022 18:08:39 +0900
Subject: [PATCH] Move `EditorClock` processing to `Update` and always decouple

---
 osu.Game/Screens/Edit/Editor.cs      |  2 +-
 osu.Game/Screens/Edit/EditorClock.cs | 38 ++++++++++++----------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a7cbe1f1ad..ad8fda7ad0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Screens.Edit
             }
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
+            clock = new EditorClock(playableBeatmap, beatDivisor);
             clock.ChangeSource(loadableBeatmap.Track);
 
             dependencies.CacheAs(clock);
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index d55f2c0bf6..7a00a74530 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit
 
             this.beatDivisor = beatDivisor ?? new BindableBeatDivisor();
 
-            underlyingClock = new FramedBeatmapClock(applyOffsets: true);
+            underlyingClock = new FramedBeatmapClock(applyOffsets: true) { IsCoupled = false };
             AddInternal(underlyingClock);
         }
 
@@ -222,21 +222,7 @@ namespace osu.Game.Screens.Edit
 
         public void ProcessFrame()
         {
-            // EditorClock wasn't being added in many places. This gives us more certainty that it is.
-            Debug.Assert(underlyingClock.LoadState > LoadState.NotLoaded);
-
-            underlyingClock.ProcessFrame();
-
-            playbackFinished = CurrentTime >= TrackLength;
-
-            if (playbackFinished)
-            {
-                if (IsRunning)
-                    underlyingClock.Stop();
-
-                if (CurrentTime > TrackLength)
-                    underlyingClock.Seek(TrackLength);
-            }
+            // Noop to ensure an external consumer doesn't process the internal clock an extra time.
         }
 
         public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
@@ -253,18 +239,26 @@ namespace osu.Game.Screens.Edit
 
         public IClock Source => underlyingClock.Source;
 
-        public bool IsCoupled
-        {
-            get => underlyingClock.IsCoupled;
-            set => underlyingClock.IsCoupled = value;
-        }
-
         private const double transform_time = 300;
 
         protected override void Update()
         {
             base.Update();
 
+            // EditorClock wasn't being added in many places. This gives us more certainty that it is.
+            Debug.Assert(underlyingClock.LoadState > LoadState.NotLoaded);
+
+            playbackFinished = CurrentTime >= TrackLength;
+
+            if (playbackFinished)
+            {
+                if (IsRunning)
+                    underlyingClock.Stop();
+
+                if (CurrentTime > TrackLength)
+                    underlyingClock.Seek(TrackLength);
+            }
+
             updateSeekingState();
         }