Merge branch 'master' into hit-sample-pooling

osu.Android.props

@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1201.0" />
   </ItemGroup>
 </Project>

osu.Game.Rulesets.Catch/Objects/Banana.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using osu.Framework.Utils;
@@ -8,6 +10,7 @@ using osu.Game.Audio;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Utils;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects
@@ -53,19 +56,22 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         private class BananaHitSampleInfo : HitSampleInfo, IEquatable<BananaHitSampleInfo>
         {
-            private static readonly string[] lookup_names = { "metronomelow", "catch-banana" };
+            private static readonly string[] lookup_names = { "Gameplay/metronomelow", "Gameplay/catch-banana" };
 
             public override IEnumerable<string> LookupNames => lookup_names;
 
-            public BananaHitSampleInfo()
+            public BananaHitSampleInfo(int volume = 0)
-                : base(string.Empty)
+                : base(string.Empty, volume: volume)
             {
             }
 
-            public bool Equals(BananaHitSampleInfo other)
+            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+                => new BananaHitSampleInfo(newVolume.GetOr(Volume));
+
+            public bool Equals(BananaHitSampleInfo? other)
                 => other != null;
 
-            public override bool Equals(object obj)
+            public override bool Equals(object? obj)
                 => obj is BananaHitSampleInfo other && Equals(other);
 
             public override int GetHashCode() => lookup_names.GetHashCode();

osu.Game/Online/Spectator/SpectatorStreamingClient.cs

@@ -36,6 +36,8 @@ namespace osu.Game.Online.Spectator
 
         private readonly List<int> watchingUsers = new List<int>();
 
+        private readonly object userLock = new object();
+
         public IBindableList<int> PlayingUsers => playingUsers;
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
@@ -144,12 +146,19 @@ namespace osu.Game.Online.Spectator
                         await connection.StartAsync();
                         Logger.Log("Spectator client connected!", LoggingTarget.Network);
 
+                        // get all the users that were previously being watched
+                        int[] users;
+
+                        lock (userLock)
+                        {
+                            users = watchingUsers.ToArray();
+                            watchingUsers.Clear();
+                        }
+
                         // success
                         isConnected = true;
 
                         // resubscribe to watched users
-                        var users = watchingUsers.ToArray();
-                        watchingUsers.Clear();
                         foreach (var userId in users)
                             WatchUser(userId);
 
@@ -238,21 +247,29 @@ namespace osu.Game.Online.Spectator
 
         public virtual void WatchUser(int userId)
         {
-            if (watchingUsers.Contains(userId))
+            lock (userLock)
-                return;
+            {
+                if (watchingUsers.Contains(userId))
+                    return;
 
-            watchingUsers.Add(userId);
+                watchingUsers.Add(userId);
 
-            if (!isConnected) return;
+                if (!isConnected)
+                    return;
+            }
 
             connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
         }
 
         public void StopWatchingUser(int userId)
         {
-            watchingUsers.Remove(userId);
+            lock (userLock)
+            {
+                watchingUsers.Remove(userId);
 
-            if (!isConnected) return;
+                if (!isConnected)
+                    return;
+            }
 
             connection.SendAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
         }

osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private readonly BindableBool rawInputToggle = new BindableBool();
         private Bindable<double> sensitivityBindable = new BindableDouble();
-        private Bindable<string> ignoredInputHandler;
+        private Bindable<string> ignoredInputHandlers;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
@@ -75,20 +75,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 {
                     // this is temporary until we support per-handler settings.
                     const string raw_mouse_handler = @"OsuTKRawMouseHandler";
-                    const string standard_mouse_handler = @"OsuTKMouseHandler";
+                    const string standard_mouse_handlers = @"OsuTKMouseHandler MouseHandler";
 
-                    ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler;
+                    ignoredInputHandlers.Value = enabled.NewValue ? standard_mouse_handlers : raw_mouse_handler;
                 };
 
-                ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
+                ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
-                ignoredInputHandler.ValueChanged += handler =>
+                ignoredInputHandlers.ValueChanged += handler =>
                 {
                     bool raw = !handler.NewValue.Contains("Raw");
                     rawInputToggle.Value = raw;
                     sensitivityBindable.Disabled = !raw;
                 };
 
-                ignoredInputHandler.TriggerChange();
+                ignoredInputHandlers.TriggerChange();
             }
         }
 

osu.Game/Screens/Edit/Editor.cs

@@ -106,6 +106,12 @@ namespace osu.Game.Screens.Edit
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, GameHost host, OsuConfigManager config)
         {
+            if (Beatmap.Value is DummyWorkingBeatmap)
+            {
+                isNewBeatmap = true;
+                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+            }
+
             beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
@@ -122,12 +128,6 @@ namespace osu.Game.Screens.Edit
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
 
-            if (Beatmap.Value is DummyWorkingBeatmap)
-            {
-                isNewBeatmap = true;
-                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
-            }
-
             try
             {
                 playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);

osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs

@@ -100,8 +100,14 @@ namespace osu.Game.Screens.Select.Carousel
                 background = new DelayedLoadWrapper(() => new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
                 {
                     RelativeSizeAxes = Axes.Both,
-                }, 300),
+                }, 300)
-                mainFlow = new DelayedLoadWrapper(() => new SetPanelContent((CarouselBeatmapSet)Item), 100),
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                mainFlow = new DelayedLoadWrapper(() => new SetPanelContent((CarouselBeatmapSet)Item), 100)
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
             };
 
             background.DelayedLoadComplete += fadeContentIn;

osu.Game/osu.Game.csproj

@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.1201.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

osu.iOS.props

@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1201.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>