Privatise the OsuGame beatmap, add local beatmap to OsuTestCase

osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs

@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
             private Bindable<double> cursorScale;
             private Bindable<bool> autoCursorScale;
-            private Bindable<WorkingBeatmap> beatmap;
+            private IBindable<WorkingBeatmap> beatmap;
 
             public OsuCursor()
             {
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuConfigManager config, OsuGameBase game)
+            private void load(OsuConfigManager config, IGameBeatmap beatmap)
             {
                 Child = cursorContainer = new SkinnableDrawable("cursor", _ => new CircularContainer
                 {
@@ -160,7 +160,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     RelativeSizeAxes = Axes.Both,
                 };
 
-                beatmap = game.Beatmap.GetBoundCopy();
+                this.beatmap = beatmap.GetBoundCopy();
                 beatmap.ValueChanged += v => calculateScale();
 
                 cursorScale = config.GetBindable<double>(OsuSetting.GameplayCursorSize);

osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using NUnit.Framework;
 using OpenTK;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -29,14 +28,11 @@ namespace osu.Game.Tests.Visual
         private RulesetStore rulesets;
         private TestBeatmapInfoWedge infoWedge;
         private readonly List<IBeatmap> beatmaps = new List<IBeatmap>();
-        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, RulesetStore rulesets)
+        private void load(RulesetStore rulesets)
         {
             this.rulesets = rulesets;
-
-            beatmap.BindTo(game.Beatmap);
         }
 
         protected override void LoadComplete()
@@ -53,11 +49,11 @@ namespace osu.Game.Tests.Visual
             AddStep("show", () =>
             {
                 infoWedge.State = Visibility.Visible;
-                infoWedge.UpdateBeatmap(beatmap);
+                infoWedge.UpdateBeatmap(Beatmap);
             });
 
             // select part is redundant, but wait for load isn't
-            selectBeatmap(beatmap.Value.Beatmap);
+            selectBeatmap(Beatmap.Value.Beatmap);
 
             AddWaitStep(3);
 
@@ -120,8 +116,8 @@ namespace osu.Game.Tests.Visual
         {
             selectNullBeatmap();
             AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text));
-            AddAssert("check default title", () => infoWedge.Info.TitleLabel.Text == beatmap.Default.BeatmapInfo.Metadata.Title);
+            AddAssert("check default title", () => infoWedge.Info.TitleLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Title);
-            AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Text == beatmap.Default.BeatmapInfo.Metadata.Artist);
+            AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Artist);
             AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
             AddAssert("check no infolabels", () => !infoWedge.Info.InfoLabelContainer.Children.Any());
         }
@@ -133,7 +129,7 @@ namespace osu.Game.Tests.Visual
             AddStep($"select {b.Metadata.Title} beatmap", () =>
             {
                 infoBefore = infoWedge.Info;
-                infoWedge.UpdateBeatmap(beatmap.Value = new TestWorkingBeatmap(b));
+                infoWedge.UpdateBeatmap(Beatmap.Value = new TestWorkingBeatmap(b));
             });
 
             AddUntilStep(() => infoWedge.Info != infoBefore, "wait for async load");
@@ -143,8 +139,8 @@ namespace osu.Game.Tests.Visual
         {
             AddStep("select null beatmap", () =>
             {
-                beatmap.Value = beatmap.Default;
+                Beatmap.Value = Beatmap.Default;
-                infoWedge.UpdateBeatmap(beatmap);
+                infoWedge.UpdateBeatmap(Beatmap);
             });
         }
 

osu.Game.Tests/Visual/TestCaseEditorCompose.cs

@@ -17,14 +17,10 @@ namespace osu.Game.Tests.Visual
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Compose) };
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame)
+        private void load()
         {
-            osuGame.Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo);
-
+            Child = new Compose();
-            var compose = new Compose();
-            compose.Beatmap.BindTo(osuGame.Beatmap);
-
-            Child = compose;
         }
     }
 }

osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using OpenTK;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
@@ -18,8 +17,6 @@ namespace osu.Game.Tests.Visual
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ScrollableTimeline), typeof(ScrollingTimelineContainer), typeof(BeatmapWaveformGraph), typeof(TimelineButton) };
 
-        private readonly ScrollableTimeline timeline;
-
         public TestCaseEditorComposeTimeline()
         {
             Children = new Drawable[]
@@ -30,7 +27,7 @@ namespace osu.Game.Tests.Visual
                     Origin = Anchor.TopCentre,
                     State = Visibility.Visible
                 },
-                timeline = new ScrollableTimeline
+                new ScrollableTimeline
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -38,11 +35,5 @@ namespace osu.Game.Tests.Visual
                 }
             };
         }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame)
-        {
-            timeline.Beatmap.BindTo(osuGame.Beatmap);
-        }
     }
 }

osu.Game.Tests/Visual/TestCaseEditorSeekSnapping.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame)
+        private void load()
         {
             var testBeatmap = new Beatmap
             {
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual
                 }
             };
 
-            osuGame.Beatmap.Value = new TestWorkingBeatmap(testBeatmap);
+            Beatmap.Value = new TestWorkingBeatmap(testBeatmap);
 
             Child = new TimingPointVisualiser(testBeatmap, 5000) { Clock = Clock };
 

osu.Game.Tests/Visual/TestCaseEditorSummaryTimeline.cs

@@ -19,19 +19,16 @@ namespace osu.Game.Tests.Visual
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(SummaryTimeline) };
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame)
+        private void load()
         {
-            osuGame.Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo);
 
-            SummaryTimeline summaryTimeline;
+            Add(new SummaryTimeline
-            Add(summaryTimeline = new SummaryTimeline
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(500, 50)
             });
-
-            summaryTimeline.Beatmap.BindTo(osuGame.Beatmap);
         }
     }
 }

osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs

@@ -38,9 +38,9 @@ namespace osu.Game.Tests.Visual
             => dependencies = new DependencyContainer(parent);
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame)
+        private void load()
         {
-            osuGame.Beatmap.Value = new TestWorkingBeatmap(new Beatmap
+            Beatmap.Value = new TestWorkingBeatmap(new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {

osu.Game.Tests/Visual/TestCaseMusicController.cs

@@ -2,12 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
-using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual
@@ -15,8 +12,6 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestCaseMusicController : OsuTestCase
     {
-        private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
-
         public TestCaseMusicController()
         {
             Clock = new FramedClock();
@@ -30,13 +25,7 @@ namespace osu.Game.Tests.Visual
 
             AddToggleStep(@"toggle visibility", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
             AddStep(@"show", () => mc.State = Visibility.Visible);
-            AddToggleStep(@"toggle beatmap lock", state => beatmapBacking.Disabled = state);
+            AddToggleStep(@"toggle beatmap lock", state => Beatmap.Disabled = state);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
-        {
-            beatmapBacking.BindTo(game.Beatmap);
         }
     }
 }

osu.Game.Tests/Visual/TestCasePlaySongSelect.cs

@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
+        private void load()
         {
             TestSongSelect songSelect = null;
 
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual
             dependencies.Cache(rulesets = new RulesetStore(factory));
             dependencies.Cache(manager = new BeatmapManager(storage, factory, rulesets, null, null)
             {
-                DefaultBeatmap = defaultBeatmap = game.Beatmap.Default
+                DefaultBeatmap = defaultBeatmap = Beatmap.Default
             });
 
             void loadNewSongSelect(bool deleteMaps = false) => AddStep("reload song select", () =>
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual
                 if (deleteMaps)
                 {
                     manager.Delete(manager.GetAllUsableBeatmapSets());
-                    game.Beatmap.SetDefault();
+                    Beatmap.SetDefault();
                 }
 
                 if (songSelect != null)

osu.Game.Tests/Visual/TestCasePlaybackControl.cs

@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual
                 Size = new Vector2(200,100)
             };
 
-            playback.Beatmap.Value = new TestWorkingBeatmap(new Beatmap());
+            Beatmap.Value = new TestWorkingBeatmap(new Beatmap());
 
             Child = playback;
         }

osu.Game.Tests/Visual/TestCasePlayerLoader.cs

@@ -12,9 +12,10 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {
+            Beatmap.Value = new DummyWorkingBeatmap(game);
+
             AddStep("load dummy beatmap", () => Add(new PlayerLoader(new Player
             {
-                InitialBeatmap = new DummyWorkingBeatmap(game),
                 AllowPause = false,
                 AllowLeadIn = false,
                 AllowResults = false,

osu.Game.Tests/Visual/TestCaseReplay.cs

@@ -26,10 +26,7 @@ namespace osu.Game.Tests.Visual
             // Reset the mods
             beatmap.Mods.Value = beatmap.Mods.Value.Where(m => !(m is ModAutoplay));
 
-            return new ReplayPlayer(replay)
+            return new ReplayPlayer(replay);
-            {
-                InitialBeatmap = beatmap
-            };
         }
     }
 }

osu.Game.Tests/Visual/TestCaseResults.cs

@@ -32,18 +32,13 @@ namespace osu.Game.Tests.Visual
             this.beatmaps = beatmaps;
         }
 
-        private WorkingBeatmap beatmap;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            if (beatmap == null)
+            var beatmapInfo = beatmaps.QueryBeatmap(b => b.RulesetID == 0);
-            {
+            if (beatmapInfo != null)
-                var beatmapInfo = beatmaps.QueryBeatmap(b => b.RulesetID == 0);
+                Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
-                if (beatmapInfo != null)
-                    beatmap = beatmaps.GetWorkingBeatmap(beatmapInfo);
-            }
 
             Add(new Results(new Score
             {
@@ -63,10 +58,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Username = "peppy",
                 }
-            })
+            }));
-            {
-                InitialBeatmap = beatmap
-            });
         }
     }
 }

osu.Game.Tests/Visual/TestCaseStoryboard.cs

@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -18,8 +17,6 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestCaseStoryboard : OsuTestCase
     {
-        private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
-
         private readonly Container<DrawableStoryboard> storyboardContainer;
         private DrawableStoryboard storyboard;
 
@@ -43,6 +40,7 @@ namespace osu.Game.Tests.Visual
                     },
                 },
             });
+
             Add(new MusicController
             {
                 Origin = Anchor.TopRight,
@@ -55,10 +53,9 @@ namespace osu.Game.Tests.Visual
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
+        private void load()
         {
-            beatmapBacking.BindTo(game.Beatmap);
+            Beatmap.ValueChanged += beatmapChanged;
-            beatmapBacking.ValueChanged += beatmapChanged;
         }
 
         private void beatmapChanged(WorkingBeatmap working)
@@ -66,10 +63,10 @@ namespace osu.Game.Tests.Visual
 
         private void restart()
         {
-            var track = beatmapBacking.Value.Track;
+            var track = Beatmap.Value.Track;
 
             track.Reset();
-            loadStoryboard(beatmapBacking.Value);
+            loadStoryboard(Beatmap);
             track.Start();
         }
 
@@ -81,7 +78,7 @@ namespace osu.Game.Tests.Visual
             var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
             storyboardContainer.Clock = decoupledClock;
 
-            storyboard = working.Storyboard.CreateDrawable(beatmapBacking);
+            storyboard = working.Storyboard.CreateDrawable(Beatmap);
             storyboard.Passing = false;
 
             storyboardContainer.Add(storyboard);

osu.Game.Tests/Visual/TestCaseWaveform.cs

@@ -5,11 +5,9 @@ using NUnit.Framework;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Screens.Edit.Screens.Compose.Timeline;
@@ -19,9 +17,8 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestCaseWaveform : OsuTestCase
     {
-        private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
+        [BackgroundDependencyLoader]
-
+        private void load()
-        public TestCaseWaveform()
         {
             FillFlowContainer flow;
             Child = flow = new FillFlowContainer
@@ -46,10 +43,11 @@ namespace osu.Game.Tests.Visual
                 var newDisplay = new BeatmapWaveformGraph
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Resolution = 1f / i
+                    Resolution = 1f / i,
+                    Beatmap = Beatmap
                 };
 
-                newDisplay.Beatmap.BindTo(beatmapBacking);
+                Beatmap.ValueChanged += b => newDisplay.Beatmap = b;
 
                 flow.Add(new Container
                 {
@@ -83,8 +81,5 @@ namespace osu.Game.Tests.Visual
                 });
             }
         }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame) => beatmapBacking.BindTo(osuGame.Beatmap);
     }
 }

osu.Game/Beatmaps/DummyWorkingBeatmap.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Beatmaps
     {
         private readonly OsuGameBase game;
 
-        public DummyWorkingBeatmap(OsuGameBase game)
+        public DummyWorkingBeatmap(OsuGameBase game = null)
             : base(new BeatmapInfo
             {
                 Metadata = new BeatmapMetadata
@@ -43,7 +43,7 @@ namespace osu.Game.Beatmaps
 
         protected override IBeatmap GetBeatmap() => new Beatmap();
 
-        protected override Texture GetBackground() => game.Textures.Get(@"Backgrounds/bg4");
+        protected override Texture GetBackground() => game?.Textures.Get(@"Backgrounds/bg4");
 
         protected override Track GetTrack() => new TrackVirtual();
 

osu.Game/Beatmaps/GameBeatmap.cs

@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Configuration;
+
+namespace osu.Game.Beatmaps
+{
+    /// <summary>
+    /// A <see cref="Bindable{WorkingBeatmap}"/> for the <see cref="OsuGame"/> beatmap.
+    /// This should be used sparingly in-favour of <see cref="IGameBeatmap"/>.
+    /// </summary>
+    public class GameBeatmap : NonNullableBindable<WorkingBeatmap>, IGameBeatmap
+    {
+        public GameBeatmap(WorkingBeatmap defaultValue)
+            : base(defaultValue)
+        {
+        }
+
+        public GameBeatmap GetBoundCopy()
+        {
+            var copy = new GameBeatmap(Default);
+            copy.BindTo(this);
+            return copy;
+        }
+    }
+}

osu.Game/Beatmaps/IGameBeatmap.cs

@@ -0,0 +1,14 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Configuration;
+
+namespace osu.Game.Beatmaps
+{
+    /// <summary>
+    /// Read-only interface for the <see cref="OsuGame"/> beatmap.
+    /// </summary>
+    public interface IGameBeatmap : IBindable<WorkingBeatmap>
+    {
+    }
+}

osu.Game/Graphics/Containers/BeatSyncedContainer.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Graphics.Containers
 {
     public class BeatSyncedContainer : Container
     {
-        protected readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         private int lastBeat;
         private TimingControlPoint lastTimingPoint;
@@ -74,9 +74,9 @@ namespace osu.Game.Graphics.Containers
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
+        private void load(IGameBeatmap beatmap)
         {
-            Beatmap.BindTo(game.Beatmap);
+            Beatmap.BindTo(beatmap);
         }
 
         protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)

osu.Game/OsuGameBase.cs

@@ -65,7 +65,7 @@ namespace osu.Game
 
         protected override Container<Drawable> Content => content;
 
-        public IBindable<WorkingBeatmap> Beatmap { get; private set; }
+        protected GameBeatmap Beatmap;
         private WorkingBeatmap lastBeatmap;
 
         private Bindable<bool> fpsDisplayVisible;
@@ -158,7 +158,7 @@ namespace osu.Game
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Light"));
 
             var defaultBeatmap = new DummyWorkingBeatmap(this);
-            Beatmap = new NonNullableBindable<WorkingBeatmap>(defaultBeatmap);
+            Beatmap = new GameBeatmap(defaultBeatmap);
             BeatmapManager.DefaultBeatmap = defaultBeatmap;
 
             // tracks play so loud our samples can't keep up.
@@ -186,6 +186,9 @@ namespace osu.Game
                 lastBeatmap = b;
             };
 
+            dependencies.Cache(Beatmap);
+            dependencies.CacheAs<IGameBeatmap>(Beatmap);
+
             FileStore.Cleanup();
 
             AddInternal(api);

osu.Game/Overlays/Music/PlaylistList.cs

@@ -73,13 +73,13 @@ namespace osu.Game.Overlays.Music
             }
 
             [BackgroundDependencyLoader]
-            private void load(BeatmapManager beatmaps, OsuGameBase osuGame)
+            private void load(BeatmapManager beatmaps, IGameBeatmap beatmap)
             {
                 beatmaps.GetAllUsableBeatmapSets().ForEach(addBeatmapSet);
                 beatmaps.ItemAdded += addBeatmapSet;
                 beatmaps.ItemRemoved += removeBeatmapSet;
 
-                beatmapBacking.BindTo(osuGame.Beatmap);
+                beatmapBacking.BindTo(beatmap);
                 beatmapBacking.ValueChanged += _ => updateSelectedSet();
             }
 

osu.Game/Overlays/Music/PlaylistOverlay.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -21,17 +20,22 @@ namespace osu.Game.Overlays.Music
         private const float transition_duration = 600;
         private const float playlist_height = 510;
 
+        /// <summary>
+        /// Invoked when the order of an item in the list has changed.
+        /// The second parameter indicates the new index of the item.
+        /// </summary>
         public Action<BeatmapSetInfo, int> OrderChanged;
 
+        private GameBeatmap beatmap;
         private BeatmapManager beatmaps;
+
         private FilterControl filter;
         private PlaylistList list;
 
-        private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
-
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, BeatmapManager beatmaps, OsuColour colours)
+        private void load(OsuColour colours, GameBeatmap beatmap, BeatmapManager beatmaps)
         {
+            this.beatmap = beatmap.GetBoundCopy();
             this.beatmaps = beatmaps;
 
             Children = new Drawable[]
@@ -73,13 +77,11 @@ namespace osu.Game.Overlays.Music
                 },
             };
 
-            beatmapBacking.BindTo(game.Beatmap);
-
             filter.Search.OnCommit = (sender, newText) =>
             {
-                BeatmapInfo beatmap = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
+                BeatmapInfo toSelect = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
-                if (beatmap != null)
+                if (toSelect != null)
-                    beatmapBacking.Value = beatmaps.GetWorkingBeatmap(beatmap);
+                    beatmap.Value = beatmaps.GetWorkingBeatmap(toSelect);
             };
         }
 
@@ -102,13 +104,13 @@ namespace osu.Game.Overlays.Music
 
         private void itemSelected(BeatmapSetInfo set)
         {
-            if (set.ID == (beatmapBacking.Value?.BeatmapSetInfo?.ID ?? -1))
+            if (set.ID == (beatmap.Value?.BeatmapSetInfo?.ID ?? -1))
             {
-                beatmapBacking.Value?.Track?.Seek(0);
+                beatmap.Value?.Track?.Seek(0);
                 return;
             }
 
-            beatmapBacking.Value = beatmaps.GetWorkingBeatmap(set.Beatmaps.First());
+            beatmap.Value = beatmaps.GetWorkingBeatmap(set.Beatmaps.First());
         }
     }
 

osu.Game/Overlays/MusicController.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -30,11 +29,8 @@ namespace osu.Game.Overlays
     public class MusicController : OsuFocusedOverlayContainer
     {
         private const float player_height = 130;
-
         private const float transition_length = 800;
-
         private const float progress_height = 10;
-
         private const float bottom_black_area_height = 55;
 
         private Drawable background;
@@ -49,16 +45,17 @@ namespace osu.Game.Overlays
 
         private PlaylistOverlay playlist;
 
+        private BeatmapManager beatmaps;
         private LocalisationEngine localisation;
 
-        private BeatmapManager beatmaps;
-        private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
         private List<BeatmapSetInfo> beatmapSets;
         private BeatmapSetInfo currentSet;
 
         private Container dragContainer;
         private Container playerContainer;
 
+        private GameBeatmap beatmap;
+
         public MusicController()
         {
             Width = 400;
@@ -97,8 +94,9 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, BeatmapManager beatmaps, OsuColour colours, LocalisationEngine localisation)
+        private void load(GameBeatmap beatmap, BeatmapManager beatmaps, OsuColour colours, LocalisationEngine localisation)
         {
+            this.beatmap = beatmap.GetBoundCopy();
             this.beatmaps = beatmaps;
             this.localisation = localisation;
 
@@ -224,8 +222,6 @@ namespace osu.Game.Overlays
             beatmaps.ItemAdded += handleBeatmapAdded;
             beatmaps.ItemRemoved += handleBeatmapRemoved;
 
-            beatmapBacking.BindTo(game.Beatmap);
-
             playlist.StateChanged += s => playlistButton.FadeColour(s == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint);
         }
 
@@ -240,9 +236,10 @@ namespace osu.Game.Overlays
 
         protected override void LoadComplete()
         {
-            beatmapBacking.ValueChanged += beatmapChanged;
+            beatmap.ValueChanged += beatmapChanged;
-            beatmapBacking.DisabledChanged += beatmapDisabledChanged;
+            beatmap.DisabledChanged += beatmapDisabledChanged;
-            beatmapBacking.TriggerChange();
+
+            beatmapChanged(beatmap.Value);
 
             base.LoadComplete();
         }
@@ -276,7 +273,7 @@ namespace osu.Game.Overlays
 
                 playButton.Icon = track.IsRunning ? FontAwesome.fa_pause_circle_o : FontAwesome.fa_play_circle_o;
 
-                if (track.HasCompleted && !track.Looping && !beatmapBacking.Disabled && beatmapSets.Any())
+                if (track.HasCompleted && !track.Looping && !beatmap.Disabled && beatmapSets.Any())
                     next();
             }
             else
@@ -289,7 +286,7 @@ namespace osu.Game.Overlays
 
             if (track == null)
             {
-                if (!beatmapBacking.Disabled)
+                if (!beatmap.Disabled)
                     next(true);
                 return;
             }
@@ -307,8 +304,8 @@ namespace osu.Game.Overlays
             var playable = beatmapSets.TakeWhile(i => i.ID != current.BeatmapSetInfo.ID).LastOrDefault() ?? beatmapSets.LastOrDefault();
             if (playable != null)
             {
-                beatmapBacking.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmapBacking);
+                beatmap.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
-                beatmapBacking.Value.Track.Restart();
+                beatmap.Value.Track.Restart();
             }
         }
 
@@ -320,8 +317,8 @@ namespace osu.Game.Overlays
             var playable = beatmapSets.SkipWhile(i => i.ID != current.BeatmapSetInfo.ID).Skip(1).FirstOrDefault() ?? beatmapSets.FirstOrDefault();
             if (playable != null)
             {
-                beatmapBacking.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmapBacking);
+                beatmap.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
-                beatmapBacking.Value.Track.Restart();
+                beatmap.Value.Track.Restart();
             }
         }
 

osu.Game/Rulesets/Edit/HitObjectComposer.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Edit
         private RulesetContainer rulesetContainer;
         private readonly List<Container> layerContainers = new List<Container>();
 
-        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
         protected HitObjectComposer(Ruleset ruleset)
         {
@@ -38,9 +38,9 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame, IFrameBasedClock framedClock)
+        private void load(IGameBeatmap beatmap, IFrameBasedClock framedClock)
         {
-            beatmap.BindTo(osuGame.Beatmap);
+            this.beatmap.BindTo(beatmap);
 
             try
             {

osu.Game/Screens/Edit/Components/BottomBarContainer.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Edit.Components
         private const float corner_radius = 5;
         private const float contents_padding = 15;
 
-        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
         protected Track Track => Beatmap.Value.Track;
 
         private readonly Drawable background;
@@ -42,8 +42,10 @@ namespace osu.Game.Screens.Edit.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(IGameBeatmap beatmap, OsuColour colours)
         {
+            Beatmap.BindTo(beatmap);
+            
             background.Colour = colours.Gray1;
         }
     }

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using osu.Framework.Allocation;
 using OpenTK;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
@@ -15,7 +16,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public abstract class TimelinePart : CompositeDrawable
     {
-        public Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         private readonly Container timeline;
 
@@ -30,6 +31,12 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(IGameBeatmap beatmap)
+        {
+            Beatmap.BindTo(beatmap);
+        }
+
         private void updateRelativeChildSize()
         {
             // the track may not be loaded completely (only has a length once it is).

osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs

@@ -20,19 +20,17 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, IAdjustableClock adjustableClock)
         {
-            TimelinePart markerPart, controlPointPart, bookmarkPart, breakPart;
-
             Children = new Drawable[]
             {
-                markerPart = new MarkerPart(adjustableClock) { RelativeSizeAxes = Axes.Both },
+                new MarkerPart(adjustableClock) { RelativeSizeAxes = Axes.Both },
-                controlPointPart = new ControlPointPart
+                new ControlPointPart
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.35f
                 },
-                bookmarkPart = new BookmarkPart
+                new BookmarkPart
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.TopCentre,
@@ -67,7 +65,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                         },
                     }
                 },
-                breakPart = new BreakPart
+                new BreakPart
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -75,11 +73,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                     Height = 0.25f
                 }
             };
-
-            markerPart.Beatmap.BindTo(Beatmap);
-            controlPointPart.Beatmap.BindTo(Beatmap);
-            bookmarkPart.Beatmap.BindTo(Beatmap);
-            breakPart.Beatmap.BindTo(Beatmap);
         }
     }
 }

osu.Game/Screens/Edit/Editor.cs

@@ -128,9 +128,9 @@ namespace osu.Game.Screens.Edit
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                             Padding = new MarginPadding { Right = 10 },
-                                            Child = timeInfo = new TimeInfoContainer { RelativeSizeAxes = Axes.Both },
+                                            Child = new TimeInfoContainer { RelativeSizeAxes = Axes.Both },
                                         },
-                                        timeline = new SummaryTimeline
+                                        new SummaryTimeline
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                         },
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Edit
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                             Padding = new MarginPadding { Left = 10 },
-                                            Child = playback = new PlaybackControl { RelativeSizeAxes = Axes.Both },
+                                            Child = new PlaybackControl { RelativeSizeAxes = Axes.Both },
                                         }
                                     },
                                 }
@@ -148,9 +148,6 @@ namespace osu.Game.Screens.Edit
                 },
             };
 
-            timeInfo.Beatmap.BindTo(Beatmap);
-            timeline.Beatmap.BindTo(Beatmap);
-            playback.Beatmap.BindTo(Beatmap);
             menuBar.Mode.ValueChanged += onModeChanged;
 
             bottomBackground.Colour = colours.Gray2;
@@ -178,7 +175,6 @@ namespace osu.Game.Screens.Edit
                     break;
             }
 
-            currentScreen.Beatmap.BindTo(Beatmap);
             LoadComponentAsync(currentScreen, screenContainer.Add);
         }
 

osu.Game/Screens/Edit/Screens/Compose/Compose.cs

@@ -28,7 +28,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose
             if (beatDivisor != null)
                 this.beatDivisor.BindTo(beatDivisor);
 
-            ScrollableTimeline timeline;
             Children = new Drawable[]
             {
                 new GridContainer
@@ -65,7 +64,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
                                                     {
                                                         RelativeSizeAxes = Axes.Both,
                                                         Padding = new MarginPadding { Right = 5 },
-                                                        Child = timeline = new ScrollableTimeline { RelativeSizeAxes = Axes.Both }
+                                                        Child = new ScrollableTimeline { RelativeSizeAxes = Axes.Both }
                                                     },
                                                     new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
                                                 },
@@ -94,8 +93,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose
                 },
             };
 
-            timeline.Beatmap.BindTo(Beatmap);
-
             var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance();
             if (ruleset == null)
             {

osu.Game/Screens/Edit/Screens/Compose/Timeline/BeatmapWaveformGraph.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
@@ -11,14 +10,13 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
 {
     public class BeatmapWaveformGraph : CompositeDrawable
     {
-        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        public WorkingBeatmap Beatmap { set => graph.Waveform = value.Waveform; }
 
         private readonly WaveformGraph graph;
 
         public BeatmapWaveformGraph()
         {
             InternalChild = graph = new WaveformGraph { RelativeSizeAxes = Axes.Both };
-            Beatmap.ValueChanged += b => graph.Waveform = b.Waveform;
         }
 
         /// <summary>

osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs

@@ -2,11 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
@@ -14,8 +12,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
 {
     public class ScrollableTimeline : CompositeDrawable
     {
-        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
-
         private readonly ScrollingTimelineContainer timelineContainer;
 
         public ScrollableTimeline()
@@ -117,7 +113,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
             hitSoundsCheckbox.Current.Value = true;
             waveformCheckbox.Current.Value = true;
 
-            timelineContainer.Beatmap.BindTo(Beatmap);
             timelineContainer.WaveformVisible.BindTo(waveformCheckbox.Current);
         }
 

osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using osu.Framework.Allocation;
 using OpenTK;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
@@ -17,7 +18,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
         public readonly Bindable<bool> HitObjectsVisible = new Bindable<bool>();
         public readonly Bindable<bool> HitSoundsVisible = new Bindable<bool>();
         public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
-        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+
+        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
         private readonly BeatmapWaveformGraph waveform;
 
@@ -36,12 +38,22 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
             Content.AutoSizeAxes = Axes.None;
             Content.RelativeSizeAxes = Axes.Both;
 
-            waveform.Beatmap.BindTo(Beatmap);
             WaveformVisible.ValueChanged += waveformVisibilityChanged;
 
             Zoom = 10;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(IGameBeatmap beatmap)
+        {
+            this.beatmap.BindTo(beatmap);
+
+            beatmap.ValueChanged += beatmapChanged;
+            beatmapChanged(beatmap.Value);
+        }
+
+        private void beatmapChanged(WorkingBeatmap beatmap) => waveform.Beatmap = beatmap;
+
         private float minZoom = 1;
         /// <summary>
         /// The minimum zoom level allowed.

osu.Game/Screens/Edit/Screens/EditorScreen.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -13,7 +14,7 @@ namespace osu.Game.Screens.Edit.Screens
     /// </summary>
     public class EditorScreen : Container
     {
-        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         protected override Container<Drawable> Content => content;
         private readonly Container content;
@@ -27,6 +28,12 @@ namespace osu.Game.Screens.Edit.Screens
             InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(IGameBeatmap beatmap)
+        {
+            Beatmap.BindTo(beatmap);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

osu.Game/Screens/Menu/Intro.cs

@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Menu
         /// </summary>
         public bool DidLoadMenu;
 
+        private GameBeatmap beatmapBacking;
+
         private MainMenu mainMenu;
         private SampleChannel welcome;
         private SampleChannel seeya;
@@ -44,8 +46,10 @@ namespace osu.Game.Screens.Menu
         private WorkingBeatmap beatmap;
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
+        private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game, GameBeatmap beatmap)
         {
+            beatmapBacking = beatmap.GetBoundCopy();
+
             menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
@@ -72,8 +76,8 @@ namespace osu.Game.Screens.Menu
                 }
             }
 
-            beatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
+            this.beatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-            track = beatmap.Track;
+            track = this.beatmap.Track;
 
             welcome = audio.Sample.Get(@"welcome");
             seeya = audio.Sample.Get(@"seeya");
@@ -83,7 +87,7 @@ namespace osu.Game.Screens.Menu
         {
             base.OnEntering(last);
 
-            Game.Beatmap.Value = beatmap;
+            beatmapBacking.Value = beatmap;
 
             if (menuVoice)
                 welcome.Play();

osu.Game/Screens/Menu/LogoVisualisation.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Menu
 {
     public class LogoVisualisation : Drawable, IHasAccentColour
     {
-        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
         /// <summary>
         /// The number of bars to jump each update iteration.
@@ -78,9 +78,9 @@ namespace osu.Game.Screens.Menu
         }
 
         [BackgroundDependencyLoader]
-        private void load(ShaderManager shaders, OsuGameBase game)
+        private void load(ShaderManager shaders, IGameBeatmap beatmap)
         {
-            beatmap.BindTo(game.Beatmap);
+            this.beatmap.BindTo(beatmap);
             shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
         }
 

osu.Game/Screens/Menu/MenuSideFlashes.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Menu
         public override bool HandleKeyboardInput => false;
         public override bool HandleMouseInput => false;
 
-        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
         private readonly Box leftBox;
         private readonly Box rightBox;
@@ -66,9 +66,9 @@ namespace osu.Game.Screens.Menu
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, OsuColour colours)
+        private void load(IGameBeatmap beatmap, OsuColour colours)
         {
-            beatmap.BindTo(game.Beatmap);
+            this.beatmap.BindTo(beatmap);
 
             // linear colour looks better in this case, so let's use it for now.
             Color4 gradientDark = colours.Blue.Opacity(0).ToLinear();

osu.Game/Screens/OsuScreen.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -61,36 +60,21 @@ namespace osu.Game.Screens
         /// </summary>
         public virtual bool AllowBeatmapRulesetChange => true;
 
-        protected readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         protected virtual float BackgroundParallaxAmount => 1;
 
         private ParallaxContainer backgroundParallaxContainer;
 
-        public WorkingBeatmap InitialBeatmap
-        {
-            set
-            {
-                if (IsLoaded) throw new InvalidOperationException($"Cannot set {nameof(InitialBeatmap)} post-load.");
-                Beatmap.Value = value;
-            }
-        }
-
         protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
 
         private SampleChannel sampleExit;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuGameBase game, OsuGame osuGame, AudioManager audio)
+        private void load(IGameBeatmap beatmap, OsuGame osuGame, AudioManager audio)
         {
-            if (game != null)
+            if (beatmap != null)
-            {
+                Beatmap.BindTo(beatmap);
-                //if we were given a beatmap at ctor time, we want to pass this on to the game-wide beatmap.
-                var localMap = Beatmap.Value;
-                Beatmap.BindTo(game.Beatmap);
-                if (localMap != null)
-                    Beatmap.Value = localMap;
-            }
 
             if (osuGame != null)
             {

osu.Game/Screens/Play/Player.cs

@@ -117,7 +117,7 @@ namespace osu.Game.Screens.Play
                     // let's try again forcing the beatmap's ruleset.
                     ruleset = beatmap.BeatmapInfo.Ruleset;
                     rulesetInstance = ruleset.CreateInstance();
-                    RulesetContainer = rulesetInstance.CreateRulesetContainerWith(Beatmap);
+                    RulesetContainer = rulesetInstance.CreateRulesetContainerWith(Beatmap.Value);
                 }
 
                 if (!RulesetContainer.Objects.Any())

osu.Game/Screens/Play/PlayerLoader.cs

@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(info = new BeatmapMetadataDisplay(Beatmap)
+            Add(info = new BeatmapMetadataDisplay(Beatmap.Value)
             {
                 Alpha = 0,
                 Anchor = Anchor.Centre,

osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Play
 {
     public abstract class ScreenWithBeatmapBackground : OsuScreen
     {
-        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
+        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
         public override bool AllowBeatmapRulesetChange => false;
 

osu.Game/Screens/Ranking/Results.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Ranking
 
         private static readonly Vector2 background_blur = new Vector2(20);
 
-        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
+        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
         private const float overscan = 1.3f;
 
@@ -272,10 +272,10 @@ namespace osu.Game.Screens.Ranking
                 switch (mode)
                 {
                     case ResultMode.Summary:
-                        currentPage = new ResultsPageScore(score, Beatmap);
+                        currentPage = new ResultsPageScore(score, Beatmap.Value);
                         break;
                     case ResultMode.Ranking:
-                        currentPage = new ResultsPageRanking(score, Beatmap);
+                        currentPage = new ResultsPageRanking(score, Beatmap.Value);
                         break;
                 }
 

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Select
         protected readonly BeatmapDetailArea BeatmapDetails;
         private bool removeAutoModOnResume;
 
+        private GameBeatmap beatmap;
+
         public PlaySongSelect()
         {
             FooterPanels.Add(modSelect = new ModSelectOverlay
@@ -53,8 +55,10 @@ namespace osu.Game.Screens.Select
         public readonly Bindable<IEnumerable<Mod>> SelectedMods = new Bindable<IEnumerable<Mod>>(new List<Mod>());
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, AudioManager audio, BeatmapManager beatmaps, DialogOverlay dialogOverlay, OsuGame osu)
+        private void load(OsuColour colours, AudioManager audio, BeatmapManager beatmaps, DialogOverlay dialogOverlay, OsuGame osu, GameBeatmap beatmap)
         {
+            this.beatmap = beatmap.GetBoundCopy();
+
             if (osu != null) SelectedMods.BindTo(osu.SelectedMods);
             modSelect.SelectedMods.BindTo(SelectedMods);
 
@@ -156,7 +160,7 @@ namespace osu.Game.Screens.Select
             }
 
             Beatmap.Value.Track.Looping = false;
-            Beatmap.Disabled = true;
+            beatmap.Disabled = true;
 
             sampleConfirm?.Play();
 

osu.Game/Screens/Select/SongSelect.cs

@@ -65,6 +65,8 @@ namespace osu.Game.Screens.Select
 
         private CancellationTokenSource initialAddSetsTask;
 
+        private GameBeatmap beatmap;
+
         private DependencyContainer dependencies;
         protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) => dependencies = new DependencyContainer(parent);
 
@@ -179,8 +181,10 @@ namespace osu.Game.Screens.Select
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours)
+        private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours, GameBeatmap beatmap)
         {
+            this.beatmap = beatmap.GetBoundCopy();
+
             dependencies.CacheAs(this);
 
             if (Footer != null)
@@ -212,14 +216,14 @@ namespace osu.Game.Screens.Select
             Carousel.BeatmapSets = this.beatmaps.GetAllUsableBeatmapSets();
 
             Beatmap.DisabledChanged += disabled => Carousel.AllowSelection = !disabled;
-            Beatmap.TriggerChange();
-
             Beatmap.ValueChanged += workingBeatmapChanged;
+
+            workingBeatmapChanged(Beatmap.Value);
         }
 
         public void Edit(BeatmapInfo beatmap)
         {
-            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap);
+            this.beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap.Value);
             Push(new Editor());
         }
 
@@ -283,7 +287,7 @@ namespace osu.Game.Screens.Select
                 {
                     bool preview = beatmap?.BeatmapSetInfoID != Beatmap.Value?.BeatmapInfo.BeatmapSetInfoID;
 
-                    Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap);
+                    this.beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap.Value);
                     ensurePlayingSelected(preview);
                 }
 
@@ -370,7 +374,7 @@ namespace osu.Game.Screens.Select
         {
             if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
             {
-                UpdateBeatmap(Beatmap);
+                UpdateBeatmap(Beatmap.Value);
                 ensurePlayingSelected();
             }
 

osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Textures;
 using System.Linq;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -63,14 +64,14 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, TextureStore textureStore)
+        private void load(IGameBeatmap beatmap, TextureStore textureStore)
         {
             var basePath = Animation.Path.ToLowerInvariant();
             for (var frame = 0; frame < Animation.FrameCount; frame++)
             {
                 var framePath = basePath.Replace(".", frame + ".");
 
-                var path = game.Beatmap.Value.BeatmapSetInfo.Files.FirstOrDefault(f => f.Filename.ToLowerInvariant() == framePath)?.FileInfo.StoragePath;
+                var path = beatmap.Value.BeatmapSetInfo.Files.FirstOrDefault(f => f.Filename.ToLowerInvariant() == framePath)?.FileInfo.StoragePath;
                 if (path == null)
                     continue;
 

osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using System.Linq;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -62,10 +63,10 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, TextureStore textureStore)
+        private void load(IGameBeatmap beatmap, TextureStore textureStore)
         {
             var spritePath = Sprite.Path.ToLowerInvariant();
-            var path = game.Beatmap.Value.BeatmapSetInfo.Files.FirstOrDefault(f => f.Filename.ToLowerInvariant() == spritePath)?.FileInfo.StoragePath;
+            var path = beatmap.Value.BeatmapSetInfo.Files.FirstOrDefault(f => f.Filename.ToLowerInvariant() == spritePath)?.FileInfo.StoragePath;
             if (path == null)
                 return;
 

osu.Game/Tests/Visual/EditorClockTestCase.cs

@@ -25,24 +25,20 @@ namespace osu.Game.Tests.Visual
         protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
             => dependencies = new DependencyContainer(parent);
 
-        private OsuGameBase osuGame;
-
         protected EditorClockTestCase()
         {
             Clock = new EditorClock(new ControlPointInfo(), BeatDivisor) { IsCoupled = false };
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame)
+        private void load()
         {
-            this.osuGame = osuGame;
-
             dependencies.Cache(BeatDivisor);
             dependencies.CacheAs<IFrameBasedClock>(Clock);
             dependencies.CacheAs<IAdjustableClock>(Clock);
 
-            osuGame.Beatmap.ValueChanged += beatmapChanged;
+            Beatmap.ValueChanged += beatmapChanged;
-            beatmapChanged(osuGame.Beatmap.Value);
+            beatmapChanged(Beatmap.Value);
         }
 
         private void beatmapChanged(WorkingBeatmap working)
@@ -68,12 +64,5 @@ namespace osu.Game.Tests.Visual
 
             return true;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            osuGame.Beatmap.ValueChanged -= beatmapChanged;
-
-            base.Dispose(isDisposing);
-        }
     }
 }

osu.Game/Tests/Visual/EditorTestCase.cs

@@ -23,9 +23,9 @@ namespace osu.Game.Tests.Visual
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame)
+        private void load()
         {
-            osuGame.Beatmap.Value = new TestWorkingBeatmap(ruleset.RulesetInfo);
+            Beatmap.Value = new TestWorkingBeatmap(ruleset.RulesetInfo);
 
             LoadComponentAsync(new Editor(), LoadScreen);
         }

osu.Game/Tests/Visual/OsuTestCase.cs

@@ -3,12 +3,28 @@
 
 using System.IO;
 using System.Reflection;
+using osu.Framework.Allocation;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Tests.Visual
 {
     public abstract class OsuTestCase : TestCase
     {
+        protected readonly GameBeatmap Beatmap = new GameBeatmap(new DummyWorkingBeatmap());
+
+        private DependencyContainer dependencies;
+
+        protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
+            => dependencies = new DependencyContainer(parent);
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            dependencies.CacheAs<IGameBeatmap>(Beatmap);
+            dependencies.Cache(Beatmap);
+        }
+
         protected override ITestCaseTestRunner CreateRunner() => new OsuTestCaseTestRunner();
 
         public class OsuTestCaseTestRunner : OsuGameBase, ITestCaseTestRunner

osu.Game/Tests/Visual/TestCasePerformancePoints.cs

@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual
                                 new ScrollContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Child = new BeatmapList(ruleset)
+                                    Child = new BeatmapList(ruleset, Beatmap)
                                 }
                             }
                         },
@@ -108,10 +108,12 @@ namespace osu.Game.Tests.Visual
         {
             private readonly Container<BeatmapDisplay> beatmapDisplays;
             private readonly Ruleset ruleset;
+            private readonly GameBeatmap beatmapBindable;
 
-            public BeatmapList(Ruleset ruleset)
+            public BeatmapList(Ruleset ruleset, GameBeatmap beatmapBindable)
             {
                 this.ruleset = ruleset;
+                this.beatmapBindable = beatmapBindable;
 
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
@@ -130,7 +132,7 @@ namespace osu.Game.Tests.Visual
                 var sets = beatmaps.GetAllUsableBeatmapSets();
                 var allBeatmaps = sets.SelectMany(s => s.Beatmaps).Where(b => ruleset.LegacyID == null || b.RulesetID == ruleset.LegacyID);
 
-                allBeatmaps.ForEach(b => beatmapDisplays.Add(new BeatmapDisplay(b)));
+                allBeatmaps.ForEach(b => beatmapDisplays.Add(new BeatmapDisplay(b, beatmapBindable)));
             }
 
             private class BeatmapDisplay : CompositeDrawable, IHasTooltip
@@ -138,27 +140,47 @@ namespace osu.Game.Tests.Visual
                 private readonly OsuSpriteText text;
                 private readonly BeatmapInfo beatmap;
 
+                private readonly GameBeatmap beatmapBindable;
+
                 private BeatmapManager beatmaps;
-                private OsuGameBase osuGame;
 
                 private bool isSelected;
 
                 public string TooltipText => text.Text;
 
-                public BeatmapDisplay(BeatmapInfo beatmap)
+                public BeatmapDisplay(BeatmapInfo beatmap, GameBeatmap beatmapBindable)
                 {
                     this.beatmap = beatmap;
+                    this.beatmapBindable = beatmapBindable;
 
                     AutoSizeAxes = Axes.Both;
                     InternalChild = text = new OsuSpriteText();
+
+                    this.beatmapBindable.ValueChanged += beatmapChanged;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(BeatmapManager beatmaps)
+                {
+                    this.beatmaps = beatmaps;
+
+                    var working = beatmaps.GetWorkingBeatmap(beatmap);
+                    text.Text = $"{working.Metadata.Artist} - {working.Metadata.Title} ({working.Metadata.AuthorString}) [{working.BeatmapInfo.Version}]";
+                }
+
+                private void beatmapChanged(WorkingBeatmap newBeatmap)
+                {
+                    if (isSelected)
+                        this.FadeColour(Color4.White, 100);
+                    isSelected = false;
                 }
 
                 protected override bool OnClick(InputState state)
                 {
-                    if (osuGame.Beatmap.Value.BeatmapInfo.ID == beatmap.ID)
+                    if (beatmapBindable.Value.BeatmapInfo.ID == beatmap.ID)
                         return false;
 
-                    osuGame.Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap);
+                    beatmapBindable.Value = beatmaps.GetWorkingBeatmap(beatmap);
                     isSelected = true;
                     return true;
                 }
@@ -177,25 +199,6 @@ namespace osu.Game.Tests.Visual
                         return;
                     this.FadeColour(Color4.White, 100);
                 }
-
-                [BackgroundDependencyLoader]
-                private void load(OsuGameBase osuGame, BeatmapManager beatmaps)
-                {
-                    this.osuGame = osuGame;
-                    this.beatmaps = beatmaps;
-
-                    var working = beatmaps.GetWorkingBeatmap(beatmap);
-                    text.Text = $"{working.Metadata.Artist} - {working.Metadata.Title} ({working.Metadata.AuthorString}) [{working.BeatmapInfo.Version}]";
-
-                    osuGame.Beatmap.ValueChanged += beatmapChanged;
-                }
-
-                private void beatmapChanged(WorkingBeatmap newBeatmap)
-                {
-                    if (isSelected)
-                        this.FadeColour(Color4.White, 100);
-                    isSelected = false;
-                }
             }
         }
 
@@ -204,7 +207,7 @@ namespace osu.Game.Tests.Visual
             private readonly FillFlowContainer<PerformanceDisplay> scores;
             private APIAccess api;
 
-            private readonly Bindable<WorkingBeatmap> currentBeatmap = new Bindable<WorkingBeatmap>();
+            private readonly IBindable<WorkingBeatmap> currentBeatmap = new Bindable<WorkingBeatmap>();
 
             public PerformanceList()
             {
@@ -220,7 +223,7 @@ namespace osu.Game.Tests.Visual
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuGameBase osuGame, APIAccess api)
+            private void load(IGameBeatmap beatmap, APIAccess api)
             {
                 this.api = api;
 
@@ -235,7 +238,7 @@ namespace osu.Game.Tests.Visual
                 }
 
                 currentBeatmap.ValueChanged += beatmapChanged;
-                currentBeatmap.BindTo(osuGame.Beatmap);
+                currentBeatmap.BindTo(beatmap);
             }
 
             private GetScoresRequest lastRequest;
@@ -333,9 +336,9 @@ namespace osu.Game.Tests.Visual
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuGameBase osuGame)
+            private void load(IGameBeatmap beatmap)
             {
-                osuGame.Beatmap.ValueChanged += beatmapChanged;
+                beatmap.ValueChanged += beatmapChanged;
             }
 
             private Cached informationCache = new Cached();

osu.Game/Tests/Visual/TestCasePlayer.cs

@@ -19,8 +19,6 @@ namespace osu.Game.Tests.Visual
 
         protected Player Player;
 
-        private TestWorkingBeatmap working;
-
         protected TestCasePlayer(Ruleset ruleset)
         {
             this.ruleset = ruleset;
@@ -65,13 +63,13 @@ namespace osu.Game.Tests.Visual
         {
             var beatmap = CreateBeatmap(r);
 
-            working = new TestWorkingBeatmap(beatmap);
+            Beatmap.Value = new TestWorkingBeatmap(beatmap);
-            working.Mods.Value = new[] { r.GetAllMods().First(m => m is ModNoFail) };
+            Beatmap.Value.Mods.Value = new[] { r.GetAllMods().First(m => m is ModNoFail) };
 
             if (Player != null)
                 Remove(Player);
 
-            var player = CreatePlayer(working, r);
+            var player = CreatePlayer(Beatmap, r);
 
             LoadComponentAsync(player, LoadScreen);
 
@@ -82,14 +80,12 @@ namespace osu.Game.Tests.Visual
         {
             base.Update();
 
-            if (working != null)
+            // note that this will override any mod rate application
-                // note that this will override any mod rate application
+            Beatmap.Value.Track.Rate = Clock.Rate;
-                working.Track.Rate = Clock.Rate;
         }
 
         protected virtual Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset) => new Player
         {
-            InitialBeatmap = beatmap,
             AllowPause = false,
             AllowLeadIn = false,
             AllowResults = false,