From c27751050be0ac704c76ceb11cfc2b25f0213c7e Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Thu, 12 Mar 2020 23:29:11 -0700
Subject: [PATCH] Switch back to strings and update setting labels

---
 .../Beatmaps/Formats/LegacyStoryboardDecoder.cs     |  2 +-
 osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs        |  2 +-
 .../Settings/Sections/Graphics/DetailSettings.cs    |  2 +-
 .../Screens/Play/PlayerSettings/VisualSettings.cs   |  2 +-
 osu.Game/Storyboards/Storyboard.cs                  | 13 +++++--------
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 8cb717076a..ba4eb7209b 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Beatmaps.Formats
                         var offset = Parsing.ParseInt(split[1]);
                         var filename = CleanFilename(split[2]);
 
-                        storyboard.GetLayer(LegacyStoryLayer.Video).Add(new StoryboardVideo(filename, offset));
+                        storyboard.GetLayer("Video").Add(new StoryboardVideo(filename, offset));
                         break;
                     }
 
diff --git a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
index c1329921ec..48e8bdbb76 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Beatmaps.Legacy
 {
-    public enum LegacyStoryLayer
+    internal enum LegacyStoryLayer
     {
         Background = 0,
         Fail = 1,
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index acf33f00b3..3089040f96 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             {
                 new SettingsCheckbox
                 {
-                    LabelText = "Storyboards",
+                    LabelText = "Storyboard / Video",
                     Bindable = config.GetBindable<bool>(OsuSetting.ShowStoryboard)
                 },
                 new SettingsCheckbox
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index bfb77e823f..d6c66d0751 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
                 {
                     Text = "Toggles:"
                 },
-                showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" },
+                showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboard / Video" },
                 beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
                 beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" }
             };
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 64ad0208c9..7cfb104576 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -1,11 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Legacy;
-using osu.Game.Storyboards.Drawables;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Storyboards.Drawables;
 
 namespace osu.Game.Storyboards
 {
@@ -29,8 +28,6 @@ namespace osu.Game.Storyboards
             layers.Add("Foreground", new StoryboardLayer("Foreground", 0));
         }
 
-        public StoryboardLayer GetLayer(LegacyStoryLayer layer) => GetLayer(layer.ToString());
-
         public StoryboardLayer GetLayer(string name)
         {
             if (!layers.TryGetValue(name, out var layer))
@@ -50,17 +47,17 @@ namespace osu.Game.Storyboards
                 if (backgroundPath == null)
                     return false;
 
-                if (GetLayer(LegacyStoryLayer.Video).Elements.Any())
+                if (GetLayer("Video").Elements.Any())
                     return true;
 
-                return GetLayer(LegacyStoryLayer.Background).Elements.Any(e => e.Path.ToLowerInvariant() == backgroundPath);
+                return GetLayer("Background").Elements.Any(e => e.Path.ToLowerInvariant() == backgroundPath);
             }
         }
 
         public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null)
         {
             var drawable = new DrawableStoryboard(this);
-            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer(LegacyStoryLayer.Video).Elements.Any() ? 16 / 9f : 4 / 3f);
+            drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer("Video").Elements.Any() ? 16 / 9f : 4 / 3f);
             return drawable;
         }
     }