From 6de244389bdff557869a0491ceeb0193458e2cdb Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Tue, 10 Mar 2020 22:50:20 -0700
Subject: [PATCH] Use OffsetClock instead of ManualClock

---
 .../Visual/Gameplay/TestSceneStoryboard.cs    |  5 ---
 .../Screens/Play/GameplayClockContainer.cs    |  9 ------
 .../Drawables/DrawableStoryboardVideo.cs      | 32 +++++--------------
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index 16a985c796..ff8437311e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
-using osu.Game.Screens.Play;
 using osu.Game.Storyboards.Drawables;
 using osuTK.Graphics;
 
@@ -25,13 +24,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private MusicController musicController = new MusicController();
 
-        [Cached]
-        private GameplayClock gameplayClock;
-
         public TestSceneStoryboard()
         {
             Clock = new FramedClock();
-            gameplayClock = new GameplayClock(Clock);
 
             AddRange(new Drawable[]
             {
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 87b0c196d3..591e969ad8 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 
@@ -117,14 +116,6 @@ namespace osu.Game.Screens.Play
             if (beatmap.BeatmapInfo.AudioLeadIn > 0)
                 startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
 
-            // some beatmaps have no AudioLeadIn but the video starts before the first object
-            var videoLayer = beatmap.Storyboard.GetLayer(LegacyStoryLayer.Video);
-
-            var videoOffset = videoLayer.Elements.SingleOrDefault()?.StartTime;
-
-            if (videoOffset != null)
-                startTime = Math.Min(startTime, videoOffset.GetValueOrDefault());
-
             Seek(startTime);
 
             adjustableClock.ProcessFrame();
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index ef14ccd4d7..d3f77e03ae 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Video;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -18,10 +17,6 @@ namespace osu.Game.Storyboards.Drawables
     {
         public readonly StoryboardVideo Video;
         private VideoSprite videoSprite;
-        private ManualClock videoClock;
-        private GameplayClock clock;
-
-        private bool videoStarted;
 
         public override bool RemoveWhenNotAlive => false;
 
@@ -33,13 +28,8 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(GameplayClock clock, IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            if (clock == null)
-                return;
-
-            this.clock = clock;
-
             var path = beatmap.Value.BeatmapSetInfo?.Files?.Find(f => f.Filename.Equals(Video.Path, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
             if (path == null)
@@ -56,29 +46,23 @@ namespace osu.Game.Storyboards.Drawables
                 FillMode = FillMode.Fill,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                AlwaysPresent = true,
                 Alpha = 0
             });
-
-            videoClock = new ManualClock();
-            videoSprite.Clock = new FramedClock(videoClock);
         }
 
-        protected override void Update()
+        protected override void LoadComplete()
         {
-            if (clock != null && clock.CurrentTime > Video.StartTime)
+            using (videoSprite.BeginAbsoluteSequence(Video.StartTime))
             {
-                if (!videoStarted)
+                videoSprite.Clock = new FramedOffsetClock(Clock)
                 {
-                    videoSprite.FadeIn(500);
-                    videoStarted = true;
-                }
+                    Offset = -Video.StartTime
+                };
 
-                // handle seeking before the video starts (break skipping, replay seek)
-                videoClock.CurrentTime = clock.CurrentTime - Video.StartTime;
+                videoSprite.FadeIn(500);
             }
 
-            base.Update();
+            base.LoadComplete();
         }
     }
 }