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

Don't stop non-looping samples immediately when pausing

Browse Source
This commit is contained in:
Dean Herbert
2020-10-05 15:07:46 +09:00
parent e41085dbb5
commit 758088672c
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -18,6 +18,7 @@ using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Scoring;
using osu.Game.Skinning;
using osu.Game.Configuration;
using osu.Game.Screens.Play;
using osuTK.Graphics;
namespace osu.Game.Rulesets.Objects.Drawables
@ -387,7 +388,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// <summary>
/// Stops playback of all samples. Automatically called when <see cref="DrawableHitObject{TObject}"/>'s lifetime has been exceeded.
/// </summary>
public virtual void StopAllSamples() => Samples?.Stop();
public virtual void StopLoopingSamples()
{
if (Samples?.Looping == true)
Samples.Stop();
protected override void Update()
{
@ -457,7 +461,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
foreach (var nested in NestedHitObjects)
nested.OnKilled();
StopAllSamples();
// failsafe to ensure looping samples don't get stuck in a playing state.
// this could occur in a non-frame-stable context where DrawableHitObjects get killed before a SkinnableSound has the chance to be stopped.
StopLoopingSamples();
UpdateResult(false);
}