Merge branch 'master' into mod-overlay

osu.Desktop.VisualTests/Benchmark.cs

@@ -24,7 +24,7 @@ namespace osu.Desktop.VisualTests
         private double timePerTest = 200;
 
         [BackgroundDependencyLoader]
-        private void load(BaseGame game)
+        private void load(Framework.Game game)
         {
             Host.MaximumDrawHz = int.MaxValue;
             Host.MaximumUpdateHz = int.MaxValue;

osu.Desktop.VisualTests/Program.cs

@@ -20,7 +20,7 @@ namespace osu.Desktop.VisualTests
         {
             bool benchmark = args.Length > 0 && args[0] == @"-benchmark";
 
-            using (BasicGameHost host = Host.GetSuitableHost(@"osu"))
+            using (GameHost host = Host.GetSuitableHost(@"osu"))
             {
                 Ruleset.Register(new OsuRuleset());
                 Ruleset.Register(new TaikoRuleset());

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -60,7 +60,16 @@ namespace osu.Desktop.VisualTests.Tests
 
                 Beatmap b = new Beatmap
                 {
-                    HitObjects = objects
+                    HitObjects = objects,
+                    BeatmapInfo = new BeatmapInfo
+                    {
+                        Metadata = new BeatmapMetadata
+                        {
+                            Artist = @"Unknown",
+                            Title = @"Sample Beatmap",
+                            Author = @"peppy",
+                        }
+                    }
                 };
 
                 decoder.Process(b);
@@ -74,10 +83,13 @@ namespace osu.Desktop.VisualTests.Tests
                 Colour = Color4.Black,
             });
 
-            Add(new Player
+            Add(new PlayerLoader(new Player
             {
                 PreferredPlayMode = PlayMode.Osu,
                 Beatmap = beatmap
+            })
+            {
+                Beatmap = beatmap
             });
         }
     }