Restore remaining editor components to use Beatmap.Track

osu.Game.Tests/Visual/Editing/TimelineTestScene.cs

@@ -3,11 +3,12 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -64,10 +65,10 @@ namespace osu.Game.Tests.Visual.Editing
             private readonly Drawable marker;
 
             [Resolved]
-            private EditorClock editorClock { get; set; }
+            private IBindable<WorkingBeatmap> beatmap { get; set; }
 
             [Resolved]
-            private MusicController musicController { get; set; }
+            private EditorClock editorClock { get; set; }
 
             public AudioVisualiser()
             {
@@ -93,8 +94,8 @@ namespace osu.Game.Tests.Visual.Editing
             {
                 base.Update();
 
-                if (musicController.TrackLoaded)
+                if (beatmap.Value.Track.IsLoaded)
-                    marker.X = (float)(editorClock.CurrentTime / musicController.CurrentTrack.Length);
+                    marker.X = (float)(editorClock.CurrentTime / beatmap.Value.Track.Length);
             }
         }
 

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

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -17,6 +18,7 @@ namespace osu.Game.Screens.Edit.Components
         private const float contents_padding = 15;
 
         protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected Track Track => Beatmap.Value.Track;
 
         private readonly Drawable background;
         private readonly Container content;

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

@@ -16,7 +16,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays;
 using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Components
@@ -28,9 +27,6 @@ namespace osu.Game.Screens.Edit.Components
         [Resolved]
         private EditorClock editorClock { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private readonly BindableNumber<double> tempo = new BindableDouble(1);
 
         [BackgroundDependencyLoader]
@@ -66,12 +62,12 @@ namespace osu.Game.Screens.Edit.Components
                 }
             };
 
-            musicController.CurrentTrack.AddAdjustment(AdjustableProperty.Tempo, tempo);
+            Track?.AddAdjustment(AdjustableProperty.Tempo, tempo);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            musicController?.CurrentTrack.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+            Track?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
 
             base.Dispose(isDisposing);
         }

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

@@ -8,7 +8,6 @@ using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
@@ -27,9 +26,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 
         protected override Container<T> Content => content;
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         public TimelinePart(Container<T> content = null)
         {
             AddInternal(this.content = content ?? new Container<T> { RelativeSizeAxes = Axes.Both });
@@ -50,14 +46,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         private void updateRelativeChildSize()
         {
             // the track may not be loaded completely (only has a length once it is).
-            if (!musicController.TrackLoaded)
+            if (!Beatmap.Value.Track.IsLoaded)
             {
                 content.RelativeChildSize = Vector2.One;
                 Schedule(updateRelativeChildSize);
                 return;
             }
 
-            content.RelativeChildSize = new Vector2((float)Math.Max(1, musicController.CurrentTrack.Length), 1);
+            content.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1);
         }
 
         protected virtual void LoadBeatmap(WorkingBeatmap beatmap)

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

@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         private bool trackWasPlaying;
 
-        private ITrack track;
+        private Track track;
 
         public Timeline()
         {
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void seekTrackToCurrent()
         {
-            if (!musicController.TrackLoaded)
+            if (!track.IsLoaded)
                 return;
 
             editorClock.Seek(Current / Content.DrawWidth * track.Length);
@@ -142,7 +142,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void scrollToTrackTime()
         {
-            if (!musicController.TrackLoaded || track.Length == 0)
+            if (!track.IsLoaded || track.Length == 0)
                 return;
 
             ScrollTo((float)(editorClock.CurrentTime / track.Length) * Content.DrawWidth, false);

osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs

@@ -3,9 +3,10 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Overlays;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private EditorBeatmap beatmap { get; set; }
 
         [Resolved]
-        private MusicController musicController { get; set; }
+        private Bindable<WorkingBeatmap> working { get; set; }
 
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
@@ -43,7 +44,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             for (var i = 0; i < beatmap.ControlPointInfo.TimingPoints.Count; i++)
             {
                 var point = beatmap.ControlPointInfo.TimingPoints[i];
-                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : musicController.CurrentTrack.Length;
+                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
 
                 int beat = 0;
 

osu.Game/Screens/Edit/Editor.cs

@@ -14,6 +14,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
+using osu.Framework.Timing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
@@ -27,7 +28,6 @@ using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
@@ -53,9 +53,6 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
-
         private Box bottomBackground;
         private Container screenContainer;
 
@@ -82,8 +79,9 @@ namespace osu.Game.Screens.Edit
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
+            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
-            clock.ChangeSource(musicController.CurrentTrack);
+            clock.ChangeSource(sourceClock);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);
@@ -348,7 +346,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            musicController.CurrentTrack.Stop();
+            Beatmap.Value.Track?.Stop();
 
             if (seekToStart)
             {

osu.Game/Screens/Edit/EditorClock.cs

@@ -30,11 +30,6 @@ namespace osu.Game.Screens.Edit
         {
         }
 
-        public EditorClock()
-            : this(new ControlPointInfo(), 1000, new BindableBeatDivisor())
-        {
-        }
-
         public EditorClock(ControlPointInfo controlPointInfo, double trackLength, BindableBeatDivisor beatDivisor)
         {
             this.beatDivisor = beatDivisor;
@@ -45,6 +40,11 @@ namespace osu.Game.Screens.Edit
             underlyingClock = new DecoupleableInterpolatingFramedClock();
         }
 
+        public EditorClock()
+            : this(new ControlPointInfo(), 1000, new BindableBeatDivisor())
+        {
+        }
+
         /// <summary>
         /// Seek to the closest snappable beat from a time.
         /// </summary>

osu.Game/Tests/Visual/EditorClockTestScene.cs

@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -43,7 +44,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource(MusicController.CurrentTrack);
+            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
             Clock.ProcessFrame();
         }