From 1d5e5966153e5fbacb206518bdeb7c70b88955b7 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 14 Mar 2023 20:44:30 +0100
Subject: [PATCH] Update `FailAnimation` to use `SkinnableSound`

---
 osu.Game/Screens/Play/FailAnimation.cs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 0214d33549..57bdad079e 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -1,15 +1,13 @@
 // 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.Audio;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets.UI;
 using System;
 using System.Collections.Generic;
 using ManagedBass.Fx;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Sample;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -21,6 +19,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -50,8 +49,7 @@ namespace osu.Game.Screens.Play
 
         private const float duration = 2500;
 
-        private ISample? failSample;
-        private SampleChannel? failSampleChannel;
+        private SkinnableSound failSample = null!;
 
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
@@ -76,10 +74,10 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, ISkinSource skin, IBindable<WorkingBeatmap> beatmap)
+        private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap)
         {
             track = beatmap.Value.Track;
-            failSample = skin.GetSample(new SampleInfo(@"Gameplay/failsound"));
+            AddInternal(failSample = new SkinnableSound(new SampleInfo("Gameplay/failsound")));
 
             AddRangeInternal(new Drawable[]
             {
@@ -126,7 +124,7 @@ namespace osu.Game.Screens.Play
 
             failHighPassFilter.CutoffTo(300);
             failLowPassFilter.CutoffTo(300, duration, Easing.OutCubic);
-            failSampleChannel = failSample?.Play();
+            failSample.Play();
 
             track.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
             track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);
@@ -159,7 +157,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void Stop()
         {
-            failSampleChannel?.Stop();
+            failSample.Stop();
             removeFilters();
         }