From da72806693cc9688f189f61daa17f2f45ead6145 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Fri, 23 Aug 2019 14:55:38 +0300
Subject: [PATCH] Remove lookup logic from SkinnableSound

---
 osu.Game/Skinning/SkinnableSound.cs | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 8e2b5cec98..23093d9bd9 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -1,7 +1,6 @@
 // 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 System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -43,28 +42,21 @@ protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             channels = hitSamples.Select(s =>
             {
-                var ch = loadChannel(s, skin.GetSample);
+                var ch = skin.GetSample(s);
+
                 if (ch == null && allowFallback)
-                    ch = loadChannel(s, audio.Samples.Get);
+                    if (s is HitSampleInfo hsi)
+                        ch = audio.Samples.Get(string.IsNullOrEmpty(hsi.Namespace)
+                            ? $"Gameplay/{hsi.Namespace}/{hsi.Bank}-{hsi.Name}"
+                            : $"Gameplay/{hsi.Bank}-{hsi.Name}");
+
+                if (ch != null)
+                    ch.Volume.Value = s.Volume / 100.0;
+
                 return ch;
             }).Where(c => c != null).ToArray();
         }
 
-        private SampleChannel loadChannel(ISampleInfo info, Func<string, SampleChannel> getSampleFunction)
-        {
-            foreach (var lookup in info.LookupNames)
-            {
-                var ch = getSampleFunction($"Gameplay/{lookup}");
-                if (ch == null)
-                    continue;
-
-                ch.Volume.Value = info.Volume / 100.0;
-                return ch;
-            }
-
-            return null;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);