From 8012b21ffae925fc610fd23d96b334ea50d37e8f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Dec 2019 20:04:37 +0900
Subject: [PATCH] Extract legacy sound type enum

---
 .../Beatmaps/Legacy/LegacyHitSoundType.cs     | 14 +++++++++++
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 24 ++++++-------------
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Beatmaps/Legacy/LegacyHitSoundType.cs

diff --git a/osu.Game/Beatmaps/Legacy/LegacyHitSoundType.cs b/osu.Game/Beatmaps/Legacy/LegacyHitSoundType.cs
new file mode 100644
index 0000000000..69adbf8f67
--- /dev/null
+++ b/osu.Game/Beatmaps/Legacy/LegacyHitSoundType.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace osu.Game.Beatmaps.Legacy
+{
+    [Flags]
+    internal enum LegacyHitSoundType
+    {
+        None = 0,
+        Normal = 1,
+        Whistle = 2,
+        Finish = 4,
+        Clap = 8
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index b5b1e26486..c22955cbf1 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             bool combo = type.HasFlag(ConvertHitObjectType.NewCombo);
             type &= ~ConvertHitObjectType.NewCombo;
 
-            var soundType = (LegacySoundType)Parsing.ParseInt(split[4]);
+            var soundType = (LegacyHitSoundType)Parsing.ParseInt(split[4]);
             var bankInfo = new SampleBankInfo();
 
             HitObject result = null;
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 }
 
                 // Populate node sound types with the default hit object sound type
-                var nodeSoundTypes = new List<LegacySoundType>();
+                var nodeSoundTypes = new List<LegacyHitSoundType>();
                 for (int i = 0; i < nodes; i++)
                     nodeSoundTypes.Add(soundType);
 
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                             break;
 
                         int.TryParse(adds[i], out var sound);
-                        nodeSoundTypes[i] = (LegacySoundType)sound;
+                        nodeSoundTypes[i] = (LegacyHitSoundType)sound;
                     }
                 }
 
@@ -333,7 +333,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="endTime">The hold end time.</param>
         protected abstract HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime);
 
-        private List<HitSampleInfo> convertSoundType(LegacySoundType type, SampleBankInfo bankInfo)
+        private List<HitSampleInfo> convertSoundType(LegacyHitSoundType type, SampleBankInfo bankInfo)
         {
             // Todo: This should return the normal SampleInfos if the specified sample file isn't found, but that's a pretty edge-case scenario
             if (!string.IsNullOrEmpty(bankInfo.Filename))
@@ -359,7 +359,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 }
             };
 
-            if (type.HasFlag(LegacySoundType.Finish))
+            if (type.HasFlag(LegacyHitSoundType.Finish))
             {
                 soundTypes.Add(new LegacyHitSampleInfo
                 {
@@ -370,7 +370,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 });
             }
 
-            if (type.HasFlag(LegacySoundType.Whistle))
+            if (type.HasFlag(LegacyHitSoundType.Whistle))
             {
                 soundTypes.Add(new LegacyHitSampleInfo
                 {
@@ -381,7 +381,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 });
             }
 
-            if (type.HasFlag(LegacySoundType.Clap))
+            if (type.HasFlag(LegacyHitSoundType.Clap))
             {
                 soundTypes.Add(new LegacyHitSampleInfo
                 {
@@ -430,15 +430,5 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 Path.ChangeExtension(Filename, null)
             };
         }
-
-        [Flags]
-        private enum LegacySoundType
-        {
-            None = 0,
-            Normal = 1,
-            Whistle = 2,
-            Finish = 4,
-            Clap = 8
-        }
     }
 }