diff --git a/osu.Android.props b/osu.Android.props
index e0392bd687..75ac298626 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
-
+
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index a365ea10d4..c2119585ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -15,13 +15,13 @@ namespace osu.Game.Rulesets.Osu.Tests
{
protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
- [TestCase(6.9311451172608853d, "diffcalc-test")]
- [TestCase(1.0736587013228804d, "zero-length-sliders")]
+ [TestCase(6.9311451172574934d, "diffcalc-test")]
+ [TestCase(1.0736586907780401d, "zero-length-sliders")]
public void Test(double expected, string name)
=> base.Test(expected, name);
- [TestCase(8.6228371119393064d, "diffcalc-test")]
- [TestCase(1.2864585434597433d, "zero-length-sliders")]
+ [TestCase(8.6228371119271454d, "diffcalc-test")]
+ [TestCase(1.2864585280364178d, "zero-length-sliders")]
public void TestClockRateAdjusted(double expected, string name)
=> Test(expected, name, new OsuModDoubleTime());
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ec49d43c67..12abc4d867 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using JetBrains.Annotations;
-using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@@ -462,7 +461,7 @@ namespace osu.Game.Skinning
var sample = Samples?.Get(lookup);
if (sample != null)
- return new LegacySkinSample(sample, this);
+ return sample;
}
return null;
@@ -505,78 +504,5 @@ namespace osu.Game.Skinning
Textures?.Dispose();
Samples?.Dispose();
}
-
- ///
- /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
- ///
- private class LegacySkinSample : ISample, IDisposable
- {
- private readonly Sample sample;
-
- [UsedImplicitly]
- private readonly LegacySkin skin;
-
- public LegacySkinSample(Sample sample, LegacySkin skin)
- {
- this.sample = sample;
- this.skin = skin;
- }
-
- public SampleChannel Play()
- {
- return sample.Play();
- }
-
- public SampleChannel GetChannel()
- {
- return sample.GetChannel();
- }
-
- public double Length => sample.Length;
-
- public Bindable PlaybackConcurrency => sample.PlaybackConcurrency;
- public BindableNumber Volume => sample.Volume;
-
- public BindableNumber Balance => sample.Balance;
-
- public BindableNumber Frequency => sample.Frequency;
-
- public BindableNumber Tempo => sample.Tempo;
-
- public void BindAdjustments(IAggregateAudioAdjustment component)
- {
- sample.BindAdjustments(component);
- }
-
- public void UnbindAdjustments(IAggregateAudioAdjustment component)
- {
- sample.UnbindAdjustments(component);
- }
-
- public void AddAdjustment(AdjustableProperty type, IBindable adjustBindable)
- {
- sample.AddAdjustment(type, adjustBindable);
- }
-
- public void RemoveAdjustment(AdjustableProperty type, IBindable adjustBindable)
- {
- sample.RemoveAdjustment(type, adjustBindable);
- }
-
- public void RemoveAllAdjustments(AdjustableProperty type)
- {
- sample.RemoveAllAdjustments(type);
- }
-
- public IBindable AggregateVolume => sample.AggregateVolume;
-
- public IBindable AggregateBalance => sample.AggregateBalance;
-
- public IBindable AggregateFrequency => sample.AggregateFrequency;
-
- public IBindable AggregateTempo => sample.AggregateTempo;
-
- public void Dispose() => sample.Dispose();
- }
}
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9731c1d5ea..b90c938a8b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 11677d345e..ce182a3054 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
-
+
@@ -93,7 +93,7 @@
-
+