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

Add debounce to notification sample playback logic

Browse Source
This commit is contained in:
Dean Herbert 2021-09-05 13:22:37 +09:00
parent 1d23ac0f2d
commit 473e15e8f3
5 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Overlays/NotificationOverlay.cs
View File

@ -9,6 +9,7 @@ using osu.Game.Overlays.Notifications;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Bindables;
using osu.Framework.Localisation;
using osu.Framework.Threading;
@ -29,6 +30,9 @@ namespace osu.Game.Overlays
private FlowContainer<NotificationSection> sections;
[Resolved]
private AudioManager audio { get; set; }
[BackgroundDependencyLoader]
private void load()
{
@ -104,6 +108,8 @@ namespace osu.Game.Overlays
private bool processingPosts = true;
private double? lastSamplePlayback;
/// <summary>
/// Post a new notification for display.
/// </summary>
@ -126,6 +132,7 @@ namespace osu.Game.Overlays
Show();
updateCounts();
playDebouncedSample(notification.PopInSampleName);
});
protected override void Update()
@ -154,7 +161,23 @@ namespace osu.Game.Overlays
this.FadeTo(0, TRANSITION_LENGTH, Easing.OutQuint);
}
private void notificationClosed() => updateCounts();
private void notificationClosed()
{
updateCounts();
// this debounce is currently shared between popin/popout sounds, which means one could potentially not play when the user is expecting it.
// popout is constant across all notification types, and should therefore be handled using playback concurrency instead, but seems broken at the moment.
playDebouncedSample("UI/overlay-pop-out");
}
private void playDebouncedSample(string sampleName)
{
if (lastSamplePlayback == null || Time.Current - lastSamplePlayback > 50)
{
audio.Samples.Get(sampleName)?.Play();
lastSamplePlayback = Time.Current;
}
}
private void updateCounts()
{

29
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -3,20 +3,18 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Game.Graphics;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Overlays.Notifications
{
@ -42,10 +40,7 @@ namespace osu.Game.Overlays.Notifications
/// </summary>
public virtual bool DisplayOnTop => true;
private Sample samplePopIn;
private Sample samplePopOut;
protected virtual string PopInSampleName => "UI/notification-pop-in";
protected virtual string PopOutSampleName => "UI/overlay-pop-out"; // TODO: replace with a unique sample?
public virtual string PopInSampleName => "UI/notification-pop-in";
protected NotificationLight Light;
private readonly CloseButton closeButton;
@ -114,7 +109,7 @@ namespace osu.Game.Overlays.Notifications
closeButton = new CloseButton
{
Alpha = 0,
Action = () => Close(),
Action = Close,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Margin = new MarginPadding
@ -127,13 +122,6 @@ namespace osu.Game.Overlays.Notifications
});
}
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
samplePopIn = audio.Samples.Get(PopInSampleName);
samplePopOut = audio.Samples.Get(PopOutSampleName);
}
protected override bool OnHover(HoverEvent e)
{
closeButton.FadeIn(75);
@ -158,8 +146,6 @@ namespace osu.Game.Overlays.Notifications
{
base.LoadComplete();
samplePopIn?.Play();
this.FadeInFromZero(200);
NotificationContent.MoveToX(DrawSize.X);
NotificationContent.MoveToX(0, 500, Easing.OutQuint);
@ -167,15 +153,12 @@ namespace osu.Game.Overlays.Notifications
public bool WasClosed;
public virtual void Close(bool playSound = true)
public virtual void Close()
{
if (WasClosed) return;
WasClosed = true;
if (playSound)
samplePopOut?.Play();
Closed?.Invoke();
this.FadeOut(100);
Expire();

7
osu.Game/Overlays/Notifications/NotificationSection.cs
View File

@ -110,12 +110,7 @@ namespace osu.Game.Overlays.Notifications
private void clearAll()
{
bool first = true;
notifications.Children.ForEach(c =>
{
c.Close(first);
first = false;
});
notifications.Children.ForEach(c => c.Close());
}
protected override void Update()

4
osu.Game/Overlays/Notifications/ProgressNotification.cs
View File

@ -150,12 +150,12 @@ namespace osu.Game.Overlays.Notifications
colourCancelled = colours.Red;
}
public override void Close(bool playSound = true)
public override void Close()
{
switch (State)
{
case ProgressNotificationState.Cancelled:
base.Close(playSound);
base.Close();
break;
case ProgressNotificationState.Active:

2
osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
View File

@ -7,7 +7,7 @@ namespace osu.Game.Overlays.Notifications
{
public class SimpleErrorNotification : SimpleNotification
{
protected override string PopInSampleName => "UI/error-notification-pop-in";
public override string PopInSampleName => "UI/error-notification-pop-in";
public SimpleErrorNotification()
{