Play a sound when starting a timeshift or multiplayer room

osu.Game/Screens/Multi/Match/RoomSubScreen.cs

@@ -4,6 +4,8 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Audio;
@@ -11,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.Multi.Match
 {
@@ -21,6 +24,8 @@ namespace osu.Game.Screens.Multi.Match
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        private SampleChannel sampleStart;
+
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
@@ -30,8 +35,17 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        [Resolved(canBeNull: true)]
+        protected Multiplayer Multiplayer { get; private set; }
+
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleStart = audio.Samples.Get(@"SongSelect/confirm-selection");
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -71,6 +85,12 @@ namespace osu.Game.Screens.Multi.Match
             return base.OnExiting(next);
         }
 
+        protected void StartPlay(Func<Player> player)
+        {
+            sampleStart?.Play();
+            Multiplayer?.Push(new PlayerLoader(player));
+        }
+
         private void selectedItemChanged()
         {
             updateWorkingBeatmap();

osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs

@@ -16,7 +16,6 @@ using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
-using osu.Game.Screens.Play;
 using osu.Game.Users;
 using ParticipantsList = osu.Game.Screens.Multi.RealtimeMultiplayer.Participants.ParticipantsList;
 
@@ -29,9 +28,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override string ShortTitle => "match";
 
-        [Resolved(canBeNull: true)]
-        private Multiplayer multiplayer { get; set; }
-
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
@@ -206,7 +202,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
 
-            multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value, userIds)));
+            StartPlay(() => new RealtimePlayer(SelectedItem.Value, userIds));
         }
 
         protected override void Dispose(bool isDisposing)

osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs

@@ -15,7 +15,6 @@ using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
@@ -220,12 +219,9 @@ namespace osu.Game.Screens.Multi.Timeshift
             }, true);
         }
 
-        private void onStart()
+        private void onStart() => StartPlay(() => new TimeshiftPlayer(SelectedItem.Value)
         {
-            multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
+            Exited = () => leaderboard.RefreshScores()
-            {
+        });
-                Exited = () => leaderboard.RefreshScores()
-            }));
-        }
     }
 }