Remove SampleInfoList

osu.Game.Rulesets.Catch/Objects/JuiceStream.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         StartTime = lastTickTime,
                         ComboColour = ComboColour,
                         X = Curve.PositionAt(distanceProgress).X / CatchPlayfield.BASE_WIDTH,
-                        Samples = new SampleInfoList(Samples.Select(s => new SampleInfo
+                        Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
                         {
                             Bank = s.Bank,
                             Name = @"slidertick",
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         StartTime = repeatStartTime + t,
                         ComboColour = ComboColour,
                         X = Curve.PositionAt(progress).X / CatchPlayfield.BASE_WIDTH,
-                        Samples = new SampleInfoList(Samples.Select(s => new SampleInfo
+                        Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
                         {
                             Bank = s.Bank,
                             Name = @"slidertick",
@@ -147,7 +147,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             set { Curve.ControlPoints = value; }
         }
 
-        public List<SampleInfoList> RepeatSamples { get; set; } = new List<SampleInfoList>();
+        public List<List<SampleInfo>> RepeatSamples { get; set; } = new List<List<SampleInfo>>();
 
         public CurveType CurveType
         {

osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs

@@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             /// </summary>
             /// <param name="time">The time to retrieve the sample info list from.</param>
             /// <returns></returns>
-            private SampleInfoList sampleInfoListAt(double time)
+            private List<SampleInfo> sampleInfoListAt(double time)
             {
                 var curveData = HitObject as IHasCurve;
 

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -435,7 +436,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         /// <param name="time">The time to retrieve the sample info list from.</param>
         /// <returns></returns>
-        private SampleInfoList sampleInfoListAt(double time)
+        private List<SampleInfo> sampleInfoListAt(double time)
         {
             var curveData = HitObject as IHasCurve;
 

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.MathUtils;
 using osu.Game.Rulesets.Objects;
@@ -77,7 +78,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 };
 
                 if (hold.Head.Samples == null)
-                    hold.Head.Samples = new SampleInfoList();
+                    hold.Head.Samples = new List<SampleInfo>();
 
                 hold.Head.Samples.Add(new SampleInfo { Name = SampleInfo.HIT_NORMAL });
 

osu.Game.Rulesets.Osu/Objects/Slider.cs

@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         internal float LazyTravelDistance;
 
-        public List<SampleInfoList> RepeatSamples { get; set; } = new List<SampleInfoList>();
+        public List<List<SampleInfo>> RepeatSamples { get; set; } = new List<List<SampleInfo>>();
         public int RepeatCount { get; set; } = 1;
 
         private int stackHeight;
@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         StackHeight = StackHeight,
                         Scale = Scale,
                         ComboColour = ComboColour,
-                        Samples = new SampleInfoList(Samples.Select(s => new SampleInfo
+                        Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
                         {
                             Bank = s.Bank,
                             Name = @"slidertick",
@@ -170,7 +170,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         StackHeight = StackHeight,
                         Scale = Scale,
                         ComboColour = ComboColour,
-                        Samples = new SampleInfoList(RepeatSamples[repeat])
+                        Samples = new List<SampleInfo>(RepeatSamples[repeat])
                     });
                 }
             }

osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs

@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             var curveData = obj as IHasCurve;
 
             // Old osu! used hit sounding to determine various hit type information
-            SampleInfoList samples = obj.Samples;
+            List<SampleInfo> samples = obj.Samples;
 
             bool strong = samples.Any(s => s.Name == SampleInfo.HIT_FINISH);
 
@@ -115,12 +115,12 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
                 if (!isForCurrentRuleset && tickSpacing > 0 && osuDuration < 2 * speedAdjustedBeatLength)
                 {
-                    List<SampleInfoList> allSamples = curveData != null ? curveData.RepeatSamples : new List<SampleInfoList>(new[] { samples });
+                    List<List<SampleInfo>> allSamples = curveData != null ? curveData.RepeatSamples : new List<List<SampleInfo>>(new[] { samples });
 
                     int i = 0;
                     for (double j = obj.StartTime; j <= obj.StartTime + taikoDuration + tickSpacing / 8; j += tickSpacing)
                     {
-                        SampleInfoList currentSamples = allSamples[i];
+                        List<SampleInfo> currentSamples = allSamples[i];
                         bool isRim = currentSamples.Any(s => s.Name == SampleInfo.HIT_CLAP || s.Name == SampleInfo.HIT_WHISTLE);
                         strong = currentSamples.Any(s => s.Name == SampleInfo.HIT_FINISH);
 

osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs

@@ -3,6 +3,7 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -75,7 +76,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
                     TickSpacing = tickSpacing,
                     StartTime = t,
                     IsStrong = IsStrong,
-                    Samples = new SampleInfoList(Samples.Select(s => new SampleInfo
+                    Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
                     {
                         Bank = s.Bank,
                         Name = @"slidertick",

osu.Game.Rulesets.Taiko/Tests/TestCaseTaikoPlayfield.cs

@@ -165,11 +165,15 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void addSwell(double duration = default_duration)
         {
-            rulesetContainer.Playfield.Add(new DrawableSwell(new Swell
+            var swell = new Swell
             {
                 StartTime = rulesetContainer.Playfield.Time.Current + scroll_time,
                 Duration = duration,
-            }));
+            };
+
+            swell.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            rulesetContainer.Playfield.Add(new DrawableSwell(swell));
         }
 
         private void addDrumRoll(bool strong, double duration = default_duration)
@@ -184,6 +188,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Duration = duration,
             };
 
+            d.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
             rulesetContainer.Playfield.Add(new DrawableDrumRoll(d));
         }
 
@@ -195,6 +201,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 IsStrong = strong
             };
 
+            h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
             if (strong)
                 rulesetContainer.Playfield.Add(new DrawableCentreHitStrong(h));
             else
@@ -209,6 +217,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 IsStrong = strong
             };
 
+            h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
             if (strong)
                 rulesetContainer.Playfield.Add(new DrawableRimHitStrong(h));
             else

osu.Game/Audio/SampleInfoList.cs

@@ -1,18 +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 System.Collections.Generic;
-
-namespace osu.Game.Audio
-{
-    public class SampleInfoList : List<SampleInfo>
-    {
-        public SampleInfoList()
-        {
-        }
-
-        public SampleInfoList(IEnumerable<SampleInfo> elements) : base(elements)
-        {
-        }
-    }
-}

osu.Game/Rulesets/Objects/HitObject.cs

@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Objects
         /// and can be treated as the default samples for the hit object.
         /// </para>
         /// </summary>
-        public SampleInfoList Samples;
+        public List<SampleInfo> Samples;
 
         [JsonIgnore]
         public SampleControlPoint SampleControlPoint;

osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
             };
         }
 
-        protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<SampleInfoList> repeatSamples)
+        protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
         {
             return new ConvertSlider
             {

osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs

@@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                     }
 
                     // Generate the final per-node samples
-                    var nodeSamples = new List<SampleInfoList>(nodes);
+                    var nodeSamples = new List<List<SampleInfo>>(nodes);
                     for (int i = 0; i <= repeatCount; i++)
                         nodeSamples.Add(convertSoundType(nodeSoundTypes[i], nodeBankInfos[i]));
 
@@ -216,7 +216,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="repeatCount">The slider repeat count.</param>
         /// <param name="repeatSamples">The samples to be played when the repeat nodes are hit. This includes the head and tail of the slider.</param>
         /// <returns>The hit object.</returns>
-        protected abstract HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<SampleInfoList> repeatSamples);
+        protected abstract HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples);
 
         /// <summary>
         /// Creates a legacy Spinner-type hit object.
@@ -234,9 +234,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="endTime">The hold end time.</param>
         protected abstract HitObject CreateHold(Vector2 position, bool newCombo, double endTime);
 
-        private SampleInfoList convertSoundType(LegacySoundType type, SampleBankInfo bankInfo)
+        private List<SampleInfo> convertSoundType(LegacySoundType type, SampleBankInfo bankInfo)
         {
-            var soundTypes = new SampleInfoList
+            var soundTypes = new List<SampleInfo>
             {
                 new SampleInfo
                 {

osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         public double Distance { get; set; }
 
-        public List<SampleInfoList> RepeatSamples { get; set; }
+        public List<List<SampleInfo>> RepeatSamples { get; set; }
         public int RepeatCount { get; set; } = 1;
 
         public double EndTime => StartTime + RepeatCount * Distance / Velocity;

osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
             };
         }
 
-        protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<SampleInfoList> repeatSamples)
+        protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
         {
             return new ConvertSlider
             {

osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs

@@ -2,9 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
+using osu.Game.Audio;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Osu
 {
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
             };
         }
 
-        protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<SampleInfoList> repeatSamples)
+        protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
         {
             return new ConvertSlider
             {

osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs

@@ -2,9 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
+using osu.Game.Audio;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 {
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
             };
         }
 
-        protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<SampleInfoList> repeatSamples)
+        protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
         {
             return new ConvertSlider
             {

osu.Game/Rulesets/Objects/Types/IHasRepeats.cs

@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The samples to be played when each repeat node is hit (0 -> first repeat node, 1 -> second repeat node, etc).
         /// </summary>
-        List<SampleInfoList> RepeatSamples { get; }
+        List<List<SampleInfo>> RepeatSamples { get; }
     }
 }

osu.Game/osu.Game.csproj

@@ -239,7 +239,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Audio\SampleInfo.cs" />
-    <Compile Include="Audio\SampleInfoList.cs" />
     <Compile Include="Beatmaps\Beatmap.cs" />
     <Compile Include="Beatmaps\BeatmapConverter.cs" />
     <Compile Include="Beatmaps\BeatmapDifficulty.cs" />