From d879b96d9f70869d001b4dfc62481eab93591390 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 Jun 2018 13:43:56 +0900
Subject: [PATCH 1/2] Implement storyboard samples

---
 .../Drawables/DrawableStoryboardSample.cs     | 68 +++++++++++++++++++
 osu.Game/Storyboards/StoryboardSample.cs      |  9 +--
 2 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
new file mode 100644
index 0000000000..9a539072d0
--- /dev/null
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -0,0 +1,68 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.IO;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Storyboards.Drawables
+{
+    public class DrawableStoryboardSample : Component
+    {
+        /// <summary>
+        /// The amount of time allowable beyond the start time of the sample, for the sample to start.
+        /// </summary>
+        private const double allowable_late_start = 100;
+
+        private readonly StoryboardSample sample;
+        private SampleChannel channel;
+
+        public override bool RemoveWhenNotAlive => false;
+
+        public DrawableStoryboardSample(StoryboardSample sample)
+        {
+            this.sample = sample;
+            LifetimeStart = sample.Time;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IBindableBeatmap beatmap)
+        {
+            // Try first with the full name, then attempt with no path
+            channel = beatmap.Value.Skin.GetSample(sample.Path) ?? beatmap.Value.Skin.GetSample(Path.ChangeExtension(sample.Path, null));
+
+            if (channel != null)
+                channel.Volume.Value = sample.Volume / 100;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (Time.Current < sample.Time)
+            {
+                // We've rewound before the start time of the sample
+                channel?.Stop();
+
+                // In the case that the user fast-forwards to a point far beyond the start time of the sample,
+                // we want to be able to fall into the if-conditional below (therefore we must not have a life time end)
+                LifetimeStart = sample.Time;
+                LifetimeEnd = double.MaxValue;
+            }
+            else if (Time.Current - Time.Elapsed < sample.Time)
+            {
+                // We've passed the start time of the sample. We only play the sample if we're within an allowable range
+                // from the sample's start, to reduce layering if we've been fast-forwarded far into the future
+                if (Time.Current - sample.Time < allowable_late_start)
+                    channel?.Play();
+
+                // In the case that the user rewinds to a point far behind the start time of the sample,
+                // we want to be able to fall into the if-conditional above (therefore we must not have a life time start)
+                LifetimeStart = double.MinValue;
+                LifetimeEnd = sample.Time;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Storyboards/StoryboardSample.cs b/osu.Game/Storyboards/StoryboardSample.cs
index d0555493a6..c34a39a7bf 100644
--- a/osu.Game/Storyboards/StoryboardSample.cs
+++ b/osu.Game/Storyboards/StoryboardSample.cs
@@ -2,14 +2,14 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;
-using System;
+using osu.Game.Storyboards.Drawables;
 
 namespace osu.Game.Storyboards
 {
     public class StoryboardSample : IStoryboardElement
     {
         public string Path { get; set; }
-        public bool IsDrawable => false;
+        public bool IsDrawable => true;
 
         public double Time;
         public float Volume;
@@ -21,9 +21,6 @@ namespace osu.Game.Storyboards
             Volume = volume;
         }
 
-        public Drawable CreateDrawable()
-        {
-            throw new InvalidOperationException();
-        }
+        public Drawable CreateDrawable() => new DrawableStoryboardSample(this);
     }
 }

From 2d602c0e3c4e599564ef165f3f4159aec185af65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Jul 2018 18:23:12 +0900
Subject: [PATCH 2/2] Add todo regarding playback skip logic

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 9a539072d0..cdec8c042f 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Storyboards.Drawables
         {
             base.Update();
 
+            // TODO: this logic will need to be consolidated with other game samples like hitsounds.
             if (Time.Current < sample.Time)
             {
                 // We've rewound before the start time of the sample