Cancel fail sound when exiting Gameplay

TeamFluXis · Dec 2, 2023 · 1952055 · 1952055
1 parent f65defc
commit 1952055
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/fluXis.Game/Screens/Gameplay/GameplaySamples.cs b/fluXis.Game/Screens/Gameplay/GameplaySamples.cs
@@ -3,6 +3,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 
@@ -17,6 +18,8 @@ public partial class GameplaySamples : Component
     private Sample[] missSamples;
     private Sample failSample;
 
+    private SampleChannel failChannel;
+
     [BackgroundDependencyLoader]
     private void load(SkinManager skins, FluXisConfig config)
     {
@@ -38,5 +41,17 @@ protected override void LoadComplete()
     public void Hit() => HitSample?.Play();
     public void Restart() => restartSample?.Play();
     public void Miss() => missSamples?[RNG.Next(0, missSamples.Length)]?.Play();
-    public void Fail() => failSample?.Play();
+
+    public void Fail() => failChannel = failSample?.Play();
+    public void CancelFail() => failChannel?.Stop();
+
+    protected override void Dispose(bool isDisposing)
+    {
+        base.Dispose(isDisposing);
+
+        HitSample?.Dispose();
+        restartSample?.Dispose();
+        failSample?.Dispose();
+        missSamples?.ForEach(s => s?.Dispose());
+    }
 }
diff --git a/fluXis.Game/Screens/Gameplay/GameplayScreen.cs b/fluXis.Game/Screens/Gameplay/GameplayScreen.cs
@@ -345,6 +345,7 @@ public override bool OnExiting(ScreenExitEvent e)
         AudioClock.LowPassFilter.CutoffTo(LowPassFilter.MAX, 500);
         ScheduleAfterChildren(() => AudioClock.RateTo(Rate, 500, Easing.InQuint));
         backgrounds.StopVideo();
+        Samples.CancelFail();
 
         return base.OnExiting(e);
     }