From 2808f8167dd40866481315156fd3b1954614f6ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 18:28:58 +0900
Subject: [PATCH] Use more regions

---
 osu.Game/Screens/Play/PlayerLoader.cs | 35 ++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 6e968de397..01873f7114 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -81,8 +81,6 @@ namespace osu.Game.Screens.Play
 
         private IdleTracker idleTracker;
 
-        private Bindable<bool> muteWarningShownOnce;
-
         private ScheduledDelegate scheduledPushPlayer;
 
         [Resolved(CanBeNull = true)]
@@ -142,6 +140,8 @@ namespace osu.Game.Screens.Play
             inputManager = GetContainingInputManager();
         }
 
+        #region Screen handling
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -156,15 +156,7 @@ namespace osu.Game.Screens.Play
             MetadataInfo.Delay(750).FadeIn(500);
             this.Delay(1800).Schedule(pushWhenLoaded);
 
-            if (!muteWarningShownOnce.Value)
-            {
-                //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
-                if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
-                {
-                    notificationOverlay?.Post(new MutedNotification());
-                    muteWarningShownOnce.Value = true;
-                }
-            }
+            showMuteWarningIfNeeded();
         }
 
         public override void OnResuming(IScreen last)
@@ -227,6 +219,8 @@ namespace osu.Game.Screens.Play
             content.StopTracking();
         }
 
+        #endregion
+
         protected override void Update()
         {
             base.Update();
@@ -351,6 +345,23 @@ namespace osu.Game.Screens.Play
 
         #endregion
 
+        #region Mute warning
+
+        private Bindable<bool> muteWarningShownOnce;
+
+        private void showMuteWarningIfNeeded()
+        {
+            if (!muteWarningShownOnce.Value)
+            {
+                //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
+                if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
+                {
+                    notificationOverlay?.Post(new MutedNotification());
+                    muteWarningShownOnce.Value = true;
+                }
+            }
+        }
+
         private class MutedNotification : SimpleNotification
         {
             public override bool IsImportant => true;
@@ -378,5 +389,7 @@ namespace osu.Game.Screens.Play
                 };
             }
         }
+
+        #endregion
     }
 }