h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-23 07:18:45 +08:00
Code Issues Releases Wiki Activity

Merge branch 'muted-notification' of https://github.com/Craftplacer/osu into muted-notification

Browse Source
This commit is contained in:
Craftplacer 2019-09-27 09:19:48 +02:00
commit f6b0e46fcd
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -59,17 +59,6 @@ namespace osu.Game.Screens.Play
private IdleTracker idleTracker;
[Resolved]
private NotificationOverlay notificationOverlay { get; set; }
[Resolved]
private VolumeOverlay volumeOverlay { get; set; }
[Resolved]
private AudioManager audioManager { get; set; }
private static bool muteWarningShownOnce;
public PlayerLoader(Func<Player> createPlayer)
{
this.createPlayer = createPlayer;
@ -159,12 +148,26 @@ namespace osu.Game.Screens.Play
content.FadeOut(250);
}
private void checkVolume(AudioManager audio)
[Resolved(CanBeNull = true)]
private NotificationOverlay notificationOverlay { get; set; }
[Resolved(CanBeNull = true)]
private VolumeOverlay volumeOverlay { get; set; }
[Resolved]
private AudioManager audioManager { get; set; }
private static bool muteWarningShownOnce;
private void checkVolume()
{
if (muteWarningShownOnce)
return;
//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 (!muteWarningShownOnce && (volumeOverlay.IsMuted.Value || audio.Volume.Value <= audio.Volume.MinValue || audio.VolumeTrack.Value <= audio.VolumeTrack.MinValue))
if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
{
notificationOverlay.Post(new MutedNotification());
notificationOverlay?.Post(new MutedNotification());
muteWarningShownOnce = true;
}
}
@ -213,7 +216,8 @@ namespace osu.Game.Screens.Play
{
inputManager = GetContainingInputManager();
base.LoadComplete();
checkVolume(audioManager);
checkVolume();
}
private ScheduledDelegate pushDebounce;