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

Merge branch 'master' into fix-sample-expire

Browse Source
This commit is contained in:
Dean Herbert
2020-12-04 13:49:08 +09:00
parent 6c46046c24 aeb059bcce
commit a0f92628ac
48 changed files with 873 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Threading;
@ -13,17 +14,21 @@ namespace osu.Game.Skinning
{
public class PausableSkinnableSound : SkinnableSound
{
public double Length => SamplesContainer.Children.Count == 0 ? 0 : SamplesContainer.Children.Max(sample => sample.Length);
public double Length => !DrawableSamples.Any() ? 0 : DrawableSamples.Max(sample => sample.Length);
protected bool RequestedPlaying { get; private set; }
public PausableSkinnableSound(ISampleInfo hitSamples)
: base(hitSamples)
public PausableSkinnableSound()
{
}
public PausableSkinnableSound(IEnumerable<ISampleInfo> hitSamples)
: base(hitSamples)
public PausableSkinnableSound([NotNull] IEnumerable<ISampleInfo> samples)
: base(samples)
{
}
public PausableSkinnableSound([NotNull] ISampleInfo sample)
: base(sample)
{
}