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

Reverse inheritance order of SkinnableSound's pause logic

Browse Source
This commit is contained in:
Dean Herbert
2020-09-30 15:45:14 +09:00
parent 59ce9fcab9
commit 414c40d298
10 changed files with 91 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
osu.Game/Skinning/SkinnableSound.cs
View File

@ -11,7 +11,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics.Audio;
using osu.Framework.Graphics.Containers;
using osu.Game.Audio;
using osu.Game.Screens.Play;
namespace osu.Game.Skinning
{
@ -22,8 +21,6 @@ namespace osu.Game.Skinning
[Resolved]
private ISampleStore samples { get; set; }
private bool requestedPlaying;
public override bool RemoveWhenNotAlive => false;
public override bool RemoveCompletedTransforms => false;
@ -37,8 +34,6 @@ namespace osu.Game.Skinning
/// </remarks>
protected bool PlayWhenZeroVolume => Looping;
protected virtual bool PlayWhenPaused => false;
private readonly AudioContainer<DrawableSample> samplesContainer;
public SkinnableSound(ISampleInfo hitSamples)
@ -52,30 +47,6 @@ namespace osu.Game.Skinning
InternalChild = samplesContainer = new AudioContainer<DrawableSample>();
}
private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
[BackgroundDependencyLoader(true)]
private void load(ISamplePlaybackDisabler samplePlaybackDisabler)
{
// if in a gameplay context, pause sample playback when gameplay is paused.
if (samplePlaybackDisabler != null)
{
samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
samplePlaybackDisabled.BindValueChanged(disabled =>
{
if (requestedPlaying)
{
if (disabled.NewValue && !PlayWhenPaused)
stop();
// it's not easy to know if a sample has finished playing (to end).
// to keep things simple only resume playing looping samples.
else if (Looping)
play();
}
});
}
}
private bool looping;
public bool Looping
@ -91,17 +62,8 @@ namespace osu.Game.Skinning
}
}
public void Play()
public virtual void Play()
{
requestedPlaying = true;
play();
}
private void play()
{
if (samplePlaybackDisabled.Value && !PlayWhenPaused)
return;
samplesContainer.ForEach(c =>
{
if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
@ -109,13 +71,7 @@ namespace osu.Game.Skinning
});
}
public void Stop()
{
requestedPlaying = false;
stop();
}
private void stop()
public virtual void Stop()
{
samplesContainer.ForEach(c => c.Stop());
}
@ -150,7 +106,7 @@ namespace osu.Game.Skinning
// Start playback internally for the new samples if the previous ones were playing beforehand.
if (wasPlaying)
play();
Play();
}
#region Re-expose AudioContainer