sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20379 from peppy/unmute-notification-ux

Browse Source 
Reduce occasions when "game is muted" notification shows
This commit is contained in:
Dan Balasescu
2022-09-20 14:59:03 +09:00
committed by GitHub
parent d4510b72da b5771ece41
commit 87f195634e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
View File

@ -264,13 +264,13 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test] [Test]
public void TestMutedNotificationMasterVolume() public void TestMutedNotificationMasterVolume()
{ {
addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, () => audioManager.Volume.IsDefault); addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, () => audioManager.Volume.Value == 0.5);
} }
[Test] [Test]
public void TestMutedNotificationTrackVolume() public void TestMutedNotificationTrackVolume()
{ {
addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, () => audioManager.VolumeTrack.IsDefault); addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, () => audioManager.VolumeTrack.Value == 0.5);
} }
[Test] [Test]

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

@ -502,7 +502,7 @@ namespace osu.Game.Screens.Play
private int restartCount; private int restartCount;
private const double volume_requirement = 0.05; private const double volume_requirement = 0.01;
private void showMuteWarningIfNeeded() private void showMuteWarningIfNeeded()
{ {
@ -539,10 +539,11 @@ namespace osu.Game.Screens.Play
volumeOverlay.IsMuted.Value = false; volumeOverlay.IsMuted.Value = false;
// Check values before resetting, as the user may have only had mute enabled, in which case we might not need to adjust volumes. // Check values before resetting, as the user may have only had mute enabled, in which case we might not need to adjust volumes.
// Note that we only restore halfway to ensure the user isn't suddenly overloaded by unexpectedly high volume.
if (audioManager.Volume.Value <= volume_requirement) if (audioManager.Volume.Value <= volume_requirement)
audioManager.Volume.SetDefault(); audioManager.Volume.Value = 0.5f;
if (audioManager.VolumeTrack.Value <= volume_requirement) if (audioManager.VolumeTrack.Value <= volume_requirement)
audioManager.VolumeTrack.SetDefault(); audioManager.VolumeTrack.Value = 0.5f;
return true; return true;
}; };