Merge GlobalSkinConfiguration settings into the LegacySetting enum

osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs

@@ -6,9 +6,9 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Tests.Gameplay
 {
@@ -190,7 +190,7 @@ namespace osu.Game.Tests.Gameplay
         }
 
         /// <summary>
-        /// Tests that when a custom sample bank is used, but <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> is disabled,
+        /// Tests that when a custom sample bank is used, but <see cref="LegacySetting.LayeredHitSounds"/> is disabled,
         /// only the additional sound will be looked up.
         /// </summary>
         [Test]
@@ -209,7 +209,7 @@ namespace osu.Game.Tests.Gameplay
         }
 
         /// <summary>
-        /// Tests that when a normal sample bank is used and <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> is disabled,
+        /// Tests that when a normal sample bank is used and <see cref="LegacySetting.LayeredHitSounds"/> is disabled,
         /// the normal sound will be looked up anyway.
         /// </summary>
         [Test]
@@ -226,6 +226,6 @@ namespace osu.Game.Tests.Gameplay
         }
 
         private void disableLayeredHitSounds()
-            => AddStep("set LayeredHitSounds to false", () => Skin.Configuration.ConfigDictionary[GlobalSkinConfiguration.LayeredHitSounds.ToString()] = "0");
+            => AddStep("set LayeredHitSounds to false", () => Skin.Configuration.ConfigDictionary[LegacySetting.LayeredHitSounds.ToString()] = "0");
     }
 }

osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs

@@ -434,7 +434,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             /// </summary>
             /// <remarks>
             /// Layered hit samples are automatically added in all modes (except osu!mania), but can be disabled
-            /// using the <see cref="GlobalSkinConfiguration.LayeredHitSounds"/> skin config option.
+            /// using the <see cref="LegacySkinConfiguration.LegacySetting.LayeredHitSounds"/> skin config option.
             /// </remarks>
             public bool IsLayered { get; set; }
         }

osu.Game/Skinning/GlobalSkinConfiguration.cs

@@ -1,11 +0,0 @@
-// 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.
-
-namespace osu.Game.Skinning
-{
-    public enum GlobalSkinConfiguration
-    {
-        AnimationFramerate,
-        LayeredHitSounds,
-    }
-}

osu.Game/Skinning/LegacySkin.cs

@@ -120,15 +120,6 @@ namespace osu.Game.Skinning
 
                     break;
 
-                case LegacySkinConfiguration.LegacySetting legacy:
-                    switch (legacy)
-                    {
-                        case LegacySkinConfiguration.LegacySetting.Version:
-                            return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
-                    }
-
-                    break;
-
                 case SkinCustomColourLookup customColour:
                     return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString()));
 
@@ -142,8 +133,11 @@ namespace osu.Game.Skinning
 
                     break;
 
+                case LegacySkinConfiguration.LegacySetting s when s == LegacySkinConfiguration.LegacySetting.Version:
+                    return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
+
                 default:
-                    // handles lookups like GlobalSkinConfiguration
+                    // handles lookups like some in LegacySkinConfiguration.LegacySetting
 
                     try
                     {

osu.Game/Skinning/LegacySkinConfiguration.cs

@@ -15,6 +15,8 @@ namespace osu.Game.Skinning
         public enum LegacySetting
         {
             Version,
+            AnimationFramerate,
+            LayeredHitSounds,
         }
     }
 }

osu.Game/Skinning/LegacySkinExtensions.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Skinning
 {
@@ -89,7 +90,7 @@ namespace osu.Game.Skinning
         {
             if (applyConfigFrameRate)
             {
-                var iniRate = source.GetConfig<GlobalSkinConfiguration, int>(GlobalSkinConfiguration.AnimationFramerate);
+                var iniRate = source.GetConfig<LegacySetting, int>(LegacySetting.AnimationFramerate);
 
                 if (iniRate?.Value > 0)
                     return 1000f / iniRate.Value;

osu.Game/Skinning/LegacySkinTransformer.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Legacy;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Skinning
 {
@@ -38,7 +39,7 @@ namespace osu.Game.Skinning
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))
                 return Source.GetSample(sampleInfo);
 
-            var playLayeredHitSounds = GetConfig<GlobalSkinConfiguration, bool>(GlobalSkinConfiguration.LayeredHitSounds);
+            var playLayeredHitSounds = GetConfig<LegacySetting, bool>(LegacySetting.LayeredHitSounds);
             if (legacySample.IsLayered && playLayeredHitSounds?.Value == false)
                 return new SampleChannelVirtual();