Move ISampleDisabler implementation to Player and FrameStabilityContainer

osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("get variables", () =>
             {
-                gameplayClock = Player.ChildrenOfType<FrameStabilityContainer>().First().GameplayClock;
+                gameplayClock = Player.ChildrenOfType<FrameStabilityContainer>().First();
                 slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
                 samples = slider.ChildrenOfType<DrawableSample>().ToArray();
             });

osu.Game/Rulesets/UI/FrameStabilityContainer.cs

@@ -18,8 +18,11 @@ namespace osu.Game.Rulesets.UI
     /// A container which consumes a parent gameplay clock and standardises frame counts for children.
     /// Will ensure a minimum of 50 frames per clock second is maintained, regardless of any system lag or seeks.
     /// </summary>
-    public class FrameStabilityContainer : Container, IHasReplayHandler
+    [Cached(typeof(ISamplePlaybackDisabler))]
+    public class FrameStabilityContainer : Container, IHasReplayHandler, ISamplePlaybackDisabler
     {
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         private readonly double gameplayStartTime;
 
         /// <summary>
@@ -35,7 +38,6 @@ namespace osu.Game.Rulesets.UI
         public GameplayClock GameplayClock => stabilityGameplayClock;
 
         [Cached(typeof(GameplayClock))]
-        [Cached(typeof(ISamplePlaybackDisabler))]
         private readonly StabilityGameplayClock stabilityGameplayClock;
 
         public FrameStabilityContainer(double gameplayStartTime = double.MinValue)
@@ -102,6 +104,8 @@ namespace osu.Game.Rulesets.UI
             requireMoreUpdateLoops = true;
             validState = !GameplayClock.IsPaused.Value;
 
+            samplePlaybackDisabled.Value = stabilityGameplayClock.ShouldDisableSamplePlayback;
+
             int loops = 0;
 
             while (validState && requireMoreUpdateLoops && loops++ < MaxCatchUpFrames)
@@ -224,6 +228,8 @@ namespace osu.Game.Rulesets.UI
 
         public ReplayInputHandler ReplayInputHandler { get; set; }
 
+        IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => samplePlaybackDisabled;
+
         private class StabilityGameplayClock : GameplayClock
         {
             public GameplayClock ParentGameplayClock;
@@ -237,7 +243,7 @@ namespace osu.Game.Rulesets.UI
             {
             }
 
-            protected override bool ShouldDisableSamplePlayback =>
+            public override bool ShouldDisableSamplePlayback =>
                 // handle the case where playback is catching up to real-time.
                 base.ShouldDisableSamplePlayback
                 || ParentSampleDisabler?.SamplePlaybackDisabled.Value == true

osu.Game/Screens/Play/GameplayClock.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play
     /// <see cref="IFrameBasedClock"/>, as this should only be done once to ensure accuracy.
     /// </remarks>
     /// </summary>
-    public class GameplayClock : IFrameBasedClock, ISamplePlaybackDisabler
+    public class GameplayClock : IFrameBasedClock
     {
         private readonly IFrameBasedClock underlyingClock;
 
@@ -28,8 +28,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual IEnumerable<Bindable<double>> NonGameplayAdjustments => Enumerable.Empty<Bindable<double>>();
 
-        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
-
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
             this.underlyingClock = underlyingClock;
@@ -66,13 +64,11 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Whether nested samples supporting the <see cref="ISamplePlaybackDisabler"/> interface should be paused.
         /// </summary>
-        protected virtual bool ShouldDisableSamplePlayback => IsPaused.Value;
+        public virtual bool ShouldDisableSamplePlayback => IsPaused.Value;
 
         public void ProcessFrame()
         {
             // intentionally not updating the underlying clock (handled externally).
-
-            samplePlaybackDisabled.Value = ShouldDisableSamplePlayback;
         }
 
         public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
@@ -82,7 +78,5 @@ namespace osu.Game.Screens.Play
         public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
 
         public IClock Source => underlyingClock;
-
-        IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => samplePlaybackDisabled;
     }
 }

osu.Game/Screens/Play/GameplayClockContainer.cs

@@ -54,7 +54,6 @@ namespace osu.Game.Screens.Play
         public GameplayClock GameplayClock => localGameplayClock;
 
         [Cached(typeof(GameplayClock))]
-        [Cached(typeof(ISamplePlaybackDisabler))]
         private readonly LocalGameplayClock localGameplayClock;
 
         private Bindable<double> userAudioOffset;

osu.Game/Screens/Play/Player.cs

@@ -35,7 +35,8 @@ using osu.Game.Users;
 namespace osu.Game.Screens.Play
 {
     [Cached]
-    public class Player : ScreenWithBeatmapBackground
+    [Cached(typeof(ISamplePlaybackDisabler))]
+    public class Player : ScreenWithBeatmapBackground, ISamplePlaybackDisabler
     {
         /// <summary>
         /// The delay upon completion of the beatmap before displaying the results screen.
@@ -55,6 +56,8 @@ namespace osu.Game.Screens.Play
         // We are managing our own adjustments (see OnEntering/OnExiting).
         public override bool AllowRateAdjustments => false;
 
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         /// <summary>
         /// Whether gameplay should pause when the game window focus is lost.
         /// </summary>
@@ -229,7 +232,11 @@ namespace osu.Game.Screens.Play
                 skipOverlay.Hide();
             }
 
-            DrawableRuleset.IsPaused.BindValueChanged(_ => updateGameplayState());
+            DrawableRuleset.IsPaused.BindValueChanged(paused =>
+            {
+                updateGameplayState();
+                samplePlaybackDisabled.Value = paused.NewValue;
+            });
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
@@ -752,5 +759,7 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
+
+        IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => samplePlaybackDisabled;
     }
 }