From a1ae739a6235f72995ec460d93874eac2a504aa6 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 15:21:50 +0900
Subject: [PATCH] Add support for Notification sounds

---
 .../Overlays/Notifications/Notification.cs    | 24 ++++++++++++++++++-
 .../Notifications/NotificationSection.cs      |  7 +++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 2dc6b39a92..86e409d0f6 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -3,6 +3,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -40,6 +42,11 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public virtual bool DisplayOnTop => true;
 
+        private SampleChannel samplePopIn;
+        private SampleChannel samplePopOut;
+        protected virtual string PopInSampleName => "UI/notification-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-pop-out"; // TODO: replace with a unique sample?
+
         protected NotificationLight Light;
         private readonly CloseButton closeButton;
         protected Container IconContent;
@@ -120,6 +127,13 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
+        }
+
         protected override bool OnHover(HoverEvent e)
         {
             closeButton.FadeIn(75);
@@ -143,6 +157,9 @@ namespace osu.Game.Overlays.Notifications
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            samplePopIn?.Play();
+
             this.FadeInFromZero(200);
             NotificationContent.MoveToX(DrawSize.X);
             NotificationContent.MoveToX(0, 500, Easing.OutQuint);
@@ -150,12 +167,17 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close()
+        public virtual void Close() => Close(true);
+
+        public virtual void Close(bool playSound)
         {
             if (WasClosed) return;
 
             WasClosed = true;
 
+            if (playSound)
+                samplePopOut?.Play();
+
             Closed?.Invoke();
             this.FadeOut(100);
             Expire();
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index c2a958b65e..c8cee22370 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -109,7 +109,12 @@ namespace osu.Game.Overlays.Notifications
 
         private void clearAll()
         {
-            notifications.Children.ForEach(c => c.Close());
+            bool playSound = true;
+            notifications.Children.ForEach(c =>
+            {
+                c.Close(playSound);
+                playSound = false;
+            });
         }
 
         protected override void Update()