From f54eb8d7fa7c3b97514afcee2fa7bb38f3a31b62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 15:07:07 +0900
Subject: [PATCH] Move `DrumSamplePlayer` to be a skinnable component

---
 .../Skinning/Argon/TaikoArgonSkinTransformer.cs    |  3 +++
 .../Skinning/Legacy/TaikoLegacySkinTransformer.cs  |  3 +++
 osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs     |  3 ++-
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs     | 14 +++++++++-----
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs       |  5 ++++-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
index 780018af4e..7e3b0e99b6 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
@@ -60,6 +60,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                             // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                             return Drawable.Empty().With(d => d.Expire());
 
+                        case TaikoSkinComponents.DrumSamplePlayer:
+                            return Drawable.Empty();
+
                         case TaikoSkinComponents.TaikoExplosionGreat:
                         case TaikoSkinComponents.TaikoExplosionMiss:
                         case TaikoSkinComponents.TaikoExplosionOk:
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index d61f9ac35d..894b91e9ce 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -52,6 +52,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                         return null;
 
+                    case TaikoSkinComponents.DrumSamplePlayer:
+                        return null;
+
                     case TaikoSkinComponents.CentreHit:
                     case TaikoSkinComponents.RimHit:
                         if (hasHitCircle)
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index b8e3313e1b..28133ffcb2 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Rulesets.Taiko
         TaikoExplosionKiai,
         Scroller,
         Mascot,
-        KiaiGlow
+        KiaiGlow,
+        DrumSamplePlayer
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 6454fb5afa..f1dcd23698 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -1,6 +1,7 @@
 // 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.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
@@ -12,13 +13,16 @@ namespace osu.Game.Rulesets.Taiko.UI
 {
     internal partial class DrumSamplePlayer : CompositeDrawable, IKeyBindingHandler<TaikoAction>
     {
-        private readonly DrumSampleTriggerSource leftRimSampleTriggerSource;
-        private readonly DrumSampleTriggerSource leftCentreSampleTriggerSource;
-        private readonly DrumSampleTriggerSource rightCentreSampleTriggerSource;
-        private readonly DrumSampleTriggerSource rightRimSampleTriggerSource;
+        private DrumSampleTriggerSource leftRimSampleTriggerSource = null!;
+        private DrumSampleTriggerSource leftCentreSampleTriggerSource = null!;
+        private DrumSampleTriggerSource rightCentreSampleTriggerSource = null!;
+        private DrumSampleTriggerSource rightRimSampleTriggerSource = null!;
 
-        public DrumSamplePlayer(HitObjectContainer hitObjectContainer)
+        [BackgroundDependencyLoader]
+        private void load(DrawableRuleset drawableRuleset)
         {
+            var hitObjectContainer = drawableRuleset.Playfield.HitObjectContainer;
+
             InternalChildren = new Drawable[]
             {
                 leftRimSampleTriggerSource = new DrumSampleTriggerSource(hitObjectContainer),
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 9f9debe7d7..23ffac1f63 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -170,7 +170,10 @@ namespace osu.Game.Rulesets.Taiko.UI
                     RelativeSizeAxes = Axes.Both,
                 },
                 drumRollHitContainer.CreateProxy(),
-                new DrumSamplePlayer(HitObjectContainer),
+                new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.DrumSamplePlayer), _ => new DrumSamplePlayer())
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
                 // this is added at the end of the hierarchy to receive input before taiko objects.
                 // but is proxied below everything to not cover visual effects such as hit explosions.
                 inputDrum,