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

Apply simple PR reviews

Browse Source
This commit is contained in:
smoogipoo 2020-11-30 18:40:22 +09:00
parent 4bbeb9ebd4
commit afb8eb636d
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Skinning/IPooledSampleProvider.cs
View File

@ -6,8 +6,16 @@ using osu.Game.Audio;
namespace osu.Game.Skinning
{
public interface IPooledSampleProvider
/// <summary>
/// Provides pooled samples to be used by <see cref="SkinnableSound"/>s.
/// </summary>
internal interface IPooledSampleProvider
{
/// <summary>
/// Retrieves a <see cref="PoolableSkinnableSample"/> from a pool.
/// </summary>
/// <param name="sampleInfo">The <see cref="SampleInfo"/> describing the sample to retrieve..</param>
/// <returns>The <see cref="PoolableSkinnableSample"/>.</returns>
[CanBeNull]
PoolableSkinnableSample GetPooledSample(ISampleInfo sampleInfo);
}

4
osu.Game/Skinning/PoolableSkinnableSample.cs
View File

@ -138,6 +138,8 @@ namespace osu.Game.Skinning
}
}
#region Re-expose AudioContainer
public BindableNumber<double> Volume => sampleContainer.Volume;
public BindableNumber<double> Balance => sampleContainer.Balance;
@ -159,5 +161,7 @@ namespace osu.Game.Skinning
public IBindable<double> AggregateFrequency => sampleContainer.AggregateFrequency;
public IBindable<double> AggregateTempo => sampleContainer.AggregateTempo;
#endregion
}
}

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

@ -40,7 +40,7 @@ namespace osu.Game.Skinning
private ISampleStore sampleStore { get; set; }
[Resolved(CanBeNull = true)]
private IPooledSampleProvider pooledProvider { get; set; }
private IPooledSampleProvider samplePool { get; set; }
/// <summary>
/// Creates a new <see cref="SkinnableSound"/>.
@ -145,7 +145,7 @@ namespace osu.Game.Skinning
foreach (var s in samples)
{
var sample = pooledProvider?.GetPooledSample(s) ?? new PoolableSkinnableSample(s);
var sample = samplePool?.GetPooledSample(s) ?? new PoolableSkinnableSample(s);
sample.Looping = Looping;
sample.Volume.Value = s.Volume / 100.0;
@ -176,7 +176,7 @@ namespace osu.Game.Skinning
=> SamplesContainer.RemoveAllAdjustments(type);
/// <summary>
/// Whether any samples currently playing.
/// Whether any samples are currently playing.
/// </summary>
public bool IsPlaying => SamplesContainer.Any(s => s.Playing);