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

Only initialise when required

Browse Source
This commit is contained in:
Dean Herbert
2019-09-02 18:18:59 +09:00
parent eaeecfb300
commit 9c53430a0f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ namespace osu.Game.Skinning
{ {
private readonly ISampleInfo[] hitSamples; private readonly ISampleInfo[] hitSamples;
private readonly List<(AdjustableProperty, BindableDouble)> adjustments = new List<(AdjustableProperty, BindableDouble)>(); private List<(AdjustableProperty, BindableDouble)> adjustments;
private SampleChannel[] channels; private SampleChannel[] channels;
@ -56,13 +56,15 @@ namespace osu.Game.Skinning
public void AddAdjustment(AdjustableProperty type, BindableDouble adjustBindable) public void AddAdjustment(AdjustableProperty type, BindableDouble adjustBindable)
{ {
if (adjustments == null) adjustments = new List<(AdjustableProperty, BindableDouble)>();
adjustments.Add((type, adjustBindable)); adjustments.Add((type, adjustBindable));
channels?.ForEach(c => c.AddAdjustment(type, adjustBindable)); channels?.ForEach(c => c.AddAdjustment(type, adjustBindable));
} }
public void RemoveAdjustment(AdjustableProperty type, BindableDouble adjustBindable) public void RemoveAdjustment(AdjustableProperty type, BindableDouble adjustBindable)
{ {
adjustments.Remove((type, adjustBindable)); adjustments?.Remove((type, adjustBindable));
channels?.ForEach(c => c.RemoveAdjustment(type, adjustBindable)); channels?.ForEach(c => c.RemoveAdjustment(type, adjustBindable));
} }
@ -84,8 +86,9 @@ namespace osu.Game.Skinning
ch.Looping = looping; ch.Looping = looping;
ch.Volume.Value = s.Volume / 100.0; ch.Volume.Value = s.Volume / 100.0;
foreach (var adjustment in adjustments) if (adjustments != null)
ch.AddAdjustment(adjustment.Item1, adjustment.Item2); foreach (var adjustment in adjustments)
ch.AddAdjustment(adjustment.Item1, adjustment.Item2);
} }
return ch; return ch;