h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Use callback method override

Browse Source
This commit is contained in:
Mysfit 2021-01-21 20:06:24 -05:00
parent b53ad50cd4
commit 5b1bdfbdc5
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
osu.Game/Skinning/PausableSkinnableSound.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Skinning
protected bool RequestedPlaying { get; private set; }
protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
public PausableSkinnableSound()
{
@ -42,37 +42,32 @@ namespace osu.Game.Skinning
// if in a gameplay context, pause sample playback when gameplay is paused.
if (samplePlaybackDisabler != null)
{
SamplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
SamplePlaybackDisabled.BindValueChanged(disabled =>
{
if (!RequestedPlaying) return;
// let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
if (!Looping) return;
cancelPendingStart();
if (disabled.NewValue)
base.Stop();
else
{
// schedule so we don't start playing a sample which is no longer alive.
scheduledStart = Schedule(() =>
{
if (RequestedPlaying)
base.Play();
});
}
});
samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
samplePlaybackDisabled.BindValueChanged(SamplePlaybackDisabledChanged);
}
}
protected virtual void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
{
if (!RequestedPlaying) return;
// let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
if (!Looping) return;
CancelPendingStart();
if (disabled.NewValue)
base.Stop();
else
ScheduleStart();
}
public override void Play(bool restart = true)
{
cancelPendingStart();
CancelPendingStart();
RequestedPlaying = true;
if (SamplePlaybackDisabled.Value)
if (samplePlaybackDisabled.Value)
return;
base.Play(restart);
@ -80,15 +75,25 @@ namespace osu.Game.Skinning
public override void Stop()
{
cancelPendingStart();
CancelPendingStart();
RequestedPlaying = false;
base.Stop();
}
private void cancelPendingStart()
protected void CancelPendingStart()
{
scheduledStart?.Cancel();
scheduledStart = null;
}
protected void ScheduleStart()
{
// schedule so we don't start playing a sample which is no longer alive.
scheduledStart = Schedule(() =>
{
if (RequestedPlaying)
base.Play();
});
}
}
}

31
osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
View File

@ -21,34 +21,29 @@ namespace osu.Game.Storyboards.Drawables
public override bool RemoveWhenNotAlive => false;
private readonly IBindable<bool> samplePlaybackDisabled;
public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
: base(sampleInfo)
{
this.sampleInfo = sampleInfo;
LifetimeStart = sampleInfo.StartTime;
samplePlaybackDisabled = SamplePlaybackDisabled.GetBoundCopy();
}
[BackgroundDependencyLoader(true)]
private void load()
{
samplePlaybackDisabled.BindValueChanged(disabled =>
{
if (!RequestedPlaying) return;
// Since storyboard samples can be very long we want to stop the playback regardless of
// whether or not the sample is looping or not
if (disabled.NewValue)
Stop();
});
}
[Resolved]
private IBindable<IReadOnlyList<Mod>> mods { get; set; }
protected override void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
{
if (!RequestedPlaying) return;
if (disabled.NewValue)
Stop();
else
{
CancelPendingStart();
ScheduleStart();
}
}
protected override void SkinChanged(ISkinSource skin, bool allowFallback)
{
base.SkinChanged(skin, allowFallback);