h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 14:53:21 +08:00
Code Issues Releases Wiki Activity

Fix the unmute notification potentially overwriting user's volume levels unnecessarily

Browse Source 
I've also changed the cutoffs to 5% rather than zero, as this seems like
a saner method of showing this dialog. With levels 5% or less, the game
is basically inaudible.

Arguably, the cutoff can be increased to 10%.
This commit is contained in:
Dean Herbert 2021-12-08 13:38:13 +09:00
parent a969fe3ef8
commit 0775053a18
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,12 +468,14 @@ namespace osu.Game.Screens.Play
private int restartCount;
private const double volume_requirement = 0.05;
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)
if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= volume_requirement || audioManager.VolumeTrack.Value <= volume_requirement)
{
notificationOverlay?.Post(new MutedNotification());
muteWarningShownOnce.Value = true;
@ -487,7 +489,7 @@ namespace osu.Game.Screens.Play
public MutedNotification()
{
Text = "Your music volume is set to 0%! Click here to restore it.";
Text = "Your game volume is too low to hear anything! Click here to restore it.";
}
[BackgroundDependencyLoader]
@ -501,8 +503,12 @@ namespace osu.Game.Screens.Play
notificationOverlay.Hide();
volumeOverlay.IsMuted.Value = false;
audioManager.Volume.SetDefault();
audioManager.VolumeTrack.SetDefault();
// Check values before resetting, as the user may have only had mute enabled, in which case we might not need to adjust volumes.
if (audioManager.Volume.Value < volume_requirement)
audioManager.Volume.SetDefault();
if (audioManager.VolumeTrack.Value < volume_requirement)
audioManager.VolumeTrack.SetDefault();
return true;
};