From c65ab5b6f148b78ae60577e8f07689bf34b0bfe9 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Thu, 6 Apr 2017 11:54:11 +0900
Subject: [PATCH] General cleanup.

---
 osu.Game/Audio/BeatmapSampleStore.cs          | 21 -------------------
 osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs |  8 ++-----
 osu.Game/osu.Game.csproj                      |  1 -
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 osu.Game/Audio/BeatmapSampleStore.cs

diff --git a/osu.Game/Audio/BeatmapSampleStore.cs b/osu.Game/Audio/BeatmapSampleStore.cs
deleted file mode 100644
index bd72070384..0000000000
--- a/osu.Game/Audio/BeatmapSampleStore.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Audio.Sample;
-using osu.Framework.IO.Stores;
-
-namespace osu.Game.Audio
-{
-    public class BeatmapSampleStore : NamespacedResourceStore<SampleChannel>
-    {
-        public BeatmapSampleStore(IResourceStore<SampleChannel> store, string ns)
-            : base(store, ns)
-        {
-        }
-
-        public SampleChannel Get(SampleInfo sampleInfo)
-        {
-            return Get($@"{sampleInfo.Bank}-{sampleInfo.Name}");
-        }
-    }
-}
diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
index 5930a99c74..d3dfddda0f 100644
--- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
@@ -32,7 +32,6 @@ namespace osu.Game.Beatmaps.Formats
 
         private LegacySampleBank defaultSampleBank;
         private int defaultSampleVolume = 100;
-        private bool samplesMatchPlaybackRate;
 
         private readonly int beatmapVersion;
 
@@ -81,9 +80,6 @@ namespace osu.Game.Beatmaps.Formats
                 case @"SampleVolume":
                     defaultSampleVolume = int.Parse(val);
                     break;
-                case "SamplesMatchPlaybackRate":
-                    samplesMatchPlaybackRate = val[0] == '1';
-                    break;
                 case @"StackLeniency":
                     beatmap.BeatmapInfo.StackLeniency = float.Parse(val, NumberFormatInfo.InvariantInfo);
                     break;
@@ -247,8 +243,8 @@ namespace osu.Game.Beatmaps.Formats
             }
 
             string stringSampleSet = sampleSet.ToString().ToLower();
-            if (stringSampleSet == "none")
-                stringSampleSet = "normal";
+            if (stringSampleSet == @"none")
+                stringSampleSet = @"normal";
 
             beatmap.TimingInfo.ControlPoints.Add(new ControlPoint
             {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 801e498115..ffa84c36d4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -71,7 +71,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Audio\BeatmapSampleStore.cs" />
     <Compile Include="Audio\SampleInfo.cs" />
     <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
     <Compile Include="Beatmaps\DifficultyCalculator.cs" />