Merge pull request #386 from peppy/general-fixes

Framework updates.

osu.Desktop.VisualTests/Benchmark.cs

@@ -24,7 +24,7 @@ public class Benchmark : OsuGameBase
         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 @@ public static void Main(string[] args)
         {
             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/OsuGameDesktop.cs

@@ -42,7 +42,7 @@ protected override void LoadComplete()
             };
         }
 
-        public override void SetHost(BasicGameHost host)
+        public override void SetHost(GameHost host)
         {
             base.SetHost(host);
             var desktopWindow = host.Window as DesktopGameWindow;

osu.Desktop/Program.cs

@@ -3,14 +3,9 @@
 
 using System;
 using System.IO;
-using System.Linq;
-using System.Threading;
 using osu.Desktop.Beatmaps.IO;
-using osu.Framework;
 using osu.Framework.Desktop;
 using osu.Framework.Desktop.Platform;
-using osu.Framework.Platform;
-using osu.Game;
 using osu.Game.IPC;
 using osu.Game.Modes;
 using osu.Game.Modes.Catch;
@@ -51,8 +46,7 @@ public static int Main(string[] args)
                     Ruleset.Register(new ManiaRuleset());
                     Ruleset.Register(new CatchRuleset());
 
-                    BaseGame osu = new OsuGameDesktop(args);
-                    host.Add(osu);
+                    host.Add(new OsuGameDesktop(args));
                     host.Run();
                 }
                 return 0;

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -65,7 +65,7 @@ public void TestImportOverIPC()
             }
         }
 
-        private OsuGameBase loadOsu(BasicGameHost host)
+        private OsuGameBase loadOsu(GameHost host)
         {
             var osu = new OsuGameBase();
             host.Add(osu);

osu.Game/Beatmaps/IO/ArchiveReader.cs

@@ -14,13 +14,13 @@ public abstract class ArchiveReader : IDisposable, IResourceStore<byte[]>
     {
         private class Reader
         {
-            public Func<BasicStorage, string, bool> Test { get; set; }
+            public Func<Storage, string, bool> Test { get; set; }
             public Type Type { get; set; }
         }
 
         private static List<Reader> readers { get; } = new List<Reader>();
 
-        public static ArchiveReader GetReader(BasicStorage storage, string path)
+        public static ArchiveReader GetReader(Storage storage, string path)
         {
             foreach (var reader in readers)
             {
@@ -30,7 +30,7 @@ public static ArchiveReader GetReader(BasicStorage storage, string path)
             throw new IOException(@"Unknown file format");
         }
 
-        protected static void AddReader<T>(Func<BasicStorage, string, bool> test) where T : ArchiveReader
+        protected static void AddReader<T>(Func<Storage, string, bool> test) where T : ArchiveReader
         {
             readers.Add(new Reader { Test = test, Type = typeof(T) });
         }

osu.Game/Configuration/OsuConfigManager.cs

@@ -189,7 +189,7 @@ protected override void InitialiseDefaults()
         public string GetUnicodeString(string nonunicode, string unicode)
             => Get<bool>(OsuConfig.ShowUnicode) ? unicode ?? nonunicode : nonunicode ?? unicode;
 
-        public OsuConfigManager(BasicStorage storage) : base(storage)
+        public OsuConfigManager(Storage storage) : base(storage)
         {
         }
     }

osu.Game/Database/BeatmapDatabase.cs

@@ -22,12 +22,12 @@ namespace osu.Game.Database
     public class BeatmapDatabase
     {
         private SQLiteConnection connection { get; set; }
-        private BasicStorage storage;
+        private Storage storage;
         public event Action<BeatmapSetInfo> BeatmapSetAdded;
 
         private BeatmapImporter ipc;
 
-        public BeatmapDatabase(BasicStorage storage, BasicGameHost importHost = null)
+        public BeatmapDatabase(Storage storage, GameHost importHost = null)
         {
             this.storage = storage;
 

osu.Game/IPC/BeatmapImporter.cs

@@ -13,7 +13,7 @@ public class BeatmapImporter
         private IpcChannel<BeatmapImportMessage> channel;
         private BeatmapDatabase beatmaps;
 
-        public BeatmapImporter(BasicGameHost host,  BeatmapDatabase beatmaps = null)
+        public BeatmapImporter(GameHost host,  BeatmapDatabase beatmaps = null)
         {
             this.beatmaps = beatmaps;
 

osu.Game/OsuGameBase.cs

@@ -20,7 +20,7 @@
 
 namespace osu.Game
 {
-    public class OsuGameBase : BaseGame, IOnlineComponent
+    public class OsuGameBase : Framework.Game, IOnlineComponent
     {
         protected OsuConfigManager LocalConfig;
 
@@ -101,7 +101,7 @@ protected override void LoadComplete()
             });
         }
 
-        public override void SetHost(BasicGameHost host)
+        public override void SetHost(GameHost host)
         {
             if (LocalConfig == null)
                 LocalConfig = new OsuConfigManager(host.Storage);

osu.Game/Overlays/MusicController.cs

@@ -45,7 +45,7 @@ public class MusicController : FocusedOverlayContainer
         private Bindable<bool> preferUnicode;
         private WorkingBeatmap current;
         private BeatmapDatabase beatmaps;
-        private BaseGame game;
+        private Framework.Game game;
 
         private Container dragContainer;
 
@@ -322,7 +322,7 @@ private void play(BeatmapInfo info, bool isNext)
             updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
         }
 
-        protected override void PerformLoad(BaseGame game)
+        protected override void PerformLoad(Framework.Game game)
         {
             this.game = game;
             base.PerformLoad(game);

osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs

@@ -14,7 +14,7 @@ public class UpdateOptions : OptionsSubsection
         protected override string Header => "Updates";
 
         [BackgroundDependencyLoader]
-        private void load(BasicStorage storage, OsuConfigManager config)
+        private void load(Storage storage, OsuConfigManager config)
         {
             Children = new Drawable[]
             {

osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs

@@ -18,10 +18,10 @@ private void load(FrameworkConfigManager config)
             Children = new Drawable[]
             {
                 new OptionLabel { Text = "Resolution: TODO dropdown" },
-                new OsuCheckbox
+                new OptionEnumDropDown<WindowMode>
                 {
-                    LabelText = "Fullscreen mode",
-                    Bindable = config.GetBindable<bool>(FrameworkConfig.Fullscreen),
+                    LabelText = "Screen mode",
+                    Bindable = config.GetBindable<WindowMode>(FrameworkConfig.WindowMode),
                 },
                 new OsuCheckbox
                 {

osu.Game/Screens/BackgroundScreen.cs

@@ -29,10 +29,10 @@ protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
             return false;
         }
 
-        BaseGame game;
+        Framework.Game game;
 
         [BackgroundDependencyLoader]
-        private void load(BaseGame game)
+        private void load(Framework.Game game)
         {
             this.game = game;
         }

osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs

@@ -10,7 +10,7 @@ namespace osu.Game.Screens.Backgrounds
     public class BackgroundScreenDefault : BackgroundScreen
     {
         [BackgroundDependencyLoader]
-        private void load(BaseGame game)
+        private void load(Framework.Game game)
         {
             Add(new Background(@"Backgrounds/bg1"));
         }

osu.Game/Screens/Play/PlayerInputManager.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play
 {
     class PlayerInputManager : UserInputManager
     {
-        public PlayerInputManager(BasicGameHost host)
+        public PlayerInputManager(GameHost host)
             : base(host)
         {
         }

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -59,7 +59,7 @@ public class PlaySongSelect : OsuScreen
         FilterControl filter;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapDatabase beatmaps, AudioManager audio, BaseGame game,
+        private void load(BeatmapDatabase beatmaps, AudioManager audio, Framework.Game game,
             OsuGame osuGame, OsuColour colours)
         {
             const float carousel_width = 640;
@@ -317,7 +317,7 @@ private void ensurePlayingSelected(bool preview = false)
             }
         }
 
-        private void addBeatmapSet(BeatmapSetInfo beatmapSet, BaseGame game, bool select = false)
+        private void addBeatmapSet(BeatmapSetInfo beatmapSet, Framework.Game game, bool select = false)
         {
             beatmapSet = database.GetWithChildren<BeatmapSetInfo>(beatmapSet.ID);
             beatmapSet.Beatmaps.ForEach(b =>
@@ -357,7 +357,7 @@ private void addBeatmapSet(BeatmapSetInfo beatmapSet, BaseGame game, bool select
             }));
         }
 
-        private void addBeatmapSets(BaseGame game, CancellationToken token)
+        private void addBeatmapSets(Framework.Game game, CancellationToken token)
         {
             foreach (var beatmapSet in database.Query<BeatmapSetInfo>())
             {