From b8b2ff2674001e9bc3334a7799a8931b5004e7d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:07:59 +0900
Subject: [PATCH] Move welcome to local usages

---
 osu.Game/Screens/Menu/IntroCircles.cs   | 7 +++++--
 osu.Game/Screens/Menu/IntroScreen.cs    | 2 --
 osu.Game/Screens/Menu/IntroTriangles.cs | 7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index 8f3b4f43c5..aa9cee969c 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 
@@ -17,11 +18,13 @@ public class IntroCircles : IntroScreen
         private const double delay_step_one = 2300;
         private const double delay_step_two = 600;
 
+        private SampleChannel welcome;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value)
-                Welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -30,7 +33,7 @@ protected override void LogoArriving(OsuLogo logo, bool resuming)
 
             if (!resuming)
             {
-                Welcome?.Play();
+                welcome?.Play();
 
                 Scheduler.AddDelayed(delegate
                 {
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index c638d4f3c9..0c192552eb 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -37,8 +37,6 @@ public abstract class IntroScreen : StartupScreen
         /// </summary>
         protected abstract string BeatmapFile { get; }
 
-        protected SampleChannel Welcome;
-
         protected Bindable<bool> MenuVoice;
 
         protected Bindable<bool> MenuMusic;
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 08941eca37..c86f1393a4 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -40,11 +41,13 @@ public class IntroTriangles : IntroScreen
 
         private BackgroundScreenDefault background;
 
+        private SampleChannel welcome;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value && !MenuMusic.Value)
-                Welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -65,7 +68,7 @@ protected override void LogoArriving(OsuLogo logo, bool resuming)
                 }, t =>
                 {
                     AddInternal(t);
-                    Welcome?.Play();
+                    welcome?.Play();
 
                     StartTrack();
                 });