Merge pull request #17930 from peppy/fix-song-select-music-control

Fix nested song select in first-run dialog fiddling with global audio
ppy · Apr 24, 2022 · 0746238 · 0746238
2 parents 21665f6 + d92c905
commit 0746238
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
@@ -62,7 +62,7 @@ private void load(OsuConfigManager config)
                                 new Drawable[]
                                 {
                                     new SampleScreenContainer(new PinnedMainMenu()),
-                                    new SampleScreenContainer(new PlaySongSelect()),
+                                    new SampleScreenContainer(new NestedSongSelect()),
                                 },
                                 // TODO: add more screens here in the future (gameplay / results)
                                 // requires a bit more consideration to isolate their behaviour from the "parent" game.
@@ -95,6 +95,11 @@ protected override void Update()
             }
         }
 
+        private class NestedSongSelect : PlaySongSelect
+        {
+            protected override bool ControlGlobalMusic => false;
+        }
+
         private class PinnedMainMenu : MainMenu
         {
             public override void OnEntering(ScreenTransitionEvent e)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
@@ -50,6 +50,12 @@ public abstract class SongSelect : ScreenWithBeatmapBackground, IKeyBindingHandl
 
         public FilterControl FilterControl { get; private set; }
 
+        /// <summary>
+        /// Whether this song select instance should take control of the global track,
+        /// applying looping and preview offsets.
+        /// </summary>
+        protected virtual bool ControlGlobalMusic => true;
+
         protected virtual bool ShowFooter => true;
 
         protected virtual bool DisplayStableImportPrompt => legacyImportManager?.SupportsImportFromStable == true;
@@ -604,15 +610,18 @@ public override void OnResuming(ScreenTransitionEvent e)
             BeatmapDetails.Refresh();
 
             beginLooping();
-            music.ResetTrackAdjustments();
 
             if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
             {
                 updateComponentFromBeatmap(Beatmap.Value);
 
-                // restart playback on returning to song select, regardless.
-                // not sure this should be a permanent thing (we may want to leave a user pause paused even on returning)
-                music.Play(requestedByUser: true);
+                if (ControlGlobalMusic)
+                {
+                    // restart playback on returning to song select, regardless.
+                    // not sure this should be a permanent thing (we may want to leave a user pause paused even on returning)
+                    music.ResetTrackAdjustments();
+                    music.Play(requestedByUser: true);
+                }
             }
 
             this.FadeIn(250);
@@ -663,6 +672,9 @@ public override bool OnExiting(ScreenExitEvent e)
 
         private void beginLooping()
         {
+            if (!ControlGlobalMusic)
+                return;
+
             Debug.Assert(!isHandlingLooping);
 
             isHandlingLooping = true;
@@ -733,6 +745,9 @@ private void updateComponentFromBeatmap(WorkingBeatmap beatmap)
         /// </summary>
         private void ensurePlayingSelected()
         {
+            if (!ControlGlobalMusic)
+                return;
+
             ITrack track = music.CurrentTrack;
 
             bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;