From cd653c1cbc5a5f11652ddfda35e4690502b2f4c0 Mon Sep 17 00:00:00 2001
From: Aergwyn <aergwyn@t-online.de>
Date: Wed, 29 Nov 2017 21:28:02 +0100
Subject: [PATCH] split storyboard loading into `GetStoryboard()`

---
 osu.Game/Beatmaps/BeatmapManager.cs | 32 ++++++++++++++++++++++-------
 osu.Game/Beatmaps/WorkingBeatmap.cs |  2 ++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 0641cabcd8..a5578bcfde 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -25,6 +25,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
+using osu.Game.Storyboards;
 
 namespace osu.Game.Beatmaps
 {
@@ -577,13 +578,6 @@ namespace osu.Game.Beatmaps
                         beatmap = decoder.Decode(stream);
                     }
 
-                    if (beatmap == null || BeatmapSetInfo.StoryboardFile == null)
-                        return beatmap;
-
-                    using (var stream = new StreamReader(store.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
-                        decoder.Decode(stream, beatmap);
-
-
                     return beatmap;
                 }
                 catch
@@ -623,6 +617,30 @@ namespace osu.Game.Beatmaps
             }
 
             protected override Waveform GetWaveform() => new Waveform(store.GetStream(getPathForFile(Metadata.AudioFile)));
+
+            protected override Storyboard GetStoryboard()
+            {
+                try
+                {
+                    Beatmap beatmap = Beatmap;
+
+                    if (beatmap == null || BeatmapSetInfo.StoryboardFile == null)
+                        return new Storyboard();
+
+                    BeatmapDecoder decoder;
+                    using (var stream = new StreamReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                        decoder = BeatmapDecoder.GetDecoder(stream);
+
+                    using (var stream = new StreamReader(store.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
+                        decoder.Decode(stream, beatmap);
+
+                    return beatmap.Storyboard;
+                }
+                catch
+                {
+                    return new Storyboard();
+                }
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 2a8178882e..456bf29387 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Game.Storyboards;
 
 namespace osu.Game.Beatmaps
 {
@@ -40,6 +41,7 @@ namespace osu.Game.Beatmaps
         protected abstract Texture GetBackground();
         protected abstract Track GetTrack();
         protected virtual Waveform GetWaveform() => new Waveform();
+        protected virtual Storyboard GetStoryboard() => new Storyboard();
 
         public bool BeatmapLoaded => beatmap.IsValueCreated;
         public Beatmap Beatmap => beatmap.Value.Result;