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

Merge branch 'master' into fix-storyboard-sample-pausing

Browse Source
This commit is contained in:
Dean Herbert
2020-09-30 22:42:00 +09:00
parent 56c8e4dacf db78a0edf4
commit 367b35bb10
35 changed files with 380 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
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,11 +21,6 @@ namespace osu.Game.Skinning
[Resolved]
private ISampleStore samples { get; set; }
/// <summary>
/// Whether playback of this sound has been requested, regardless of whether it could be played or not (due to being paused, for instance).
/// </summary>
protected bool PlaybackRequested;
public override bool RemoveWhenNotAlive => false;
public override bool RemoveCompletedTransforms => false;
@ -40,8 +34,6 @@ namespace osu.Game.Skinning
/// </remarks>
protected bool PlayWhenZeroVolume => Looping;
protected virtual bool PlayWhenPaused => false;
protected readonly AudioContainer<DrawableSample> SamplesContainer;
public SkinnableSound(ISampleInfo hitSamples)
@ -55,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 (PlaybackRequested)
{
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
@ -94,17 +62,8 @@ namespace osu.Game.Skinning
}
}
public void Play()
public virtual void Play()
{
PlaybackRequested = true;
play();
}
private void play()
{
if (samplePlaybackDisabled.Value && !PlayWhenPaused)
return;
SamplesContainer.ForEach(c =>
{
if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
@ -112,13 +71,7 @@ namespace osu.Game.Skinning
});
}
public void Stop()
{
PlaybackRequested = false;
stop();
}
private void stop()
public virtual void Stop()
{
SamplesContainer.ForEach(c => c.Stop());
}
@ -153,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