Merge branch 'master' into autoreplay-refactor-squashed

osu.Game/Beatmaps/Drawables/BeatmapGroup.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Beatmaps.Drawables
         /// <summary>
         /// Fires when one of our difficulties was selected. Will fire on first expand.
         /// </summary>
-        public Action<BeatmapGroup, BeatmapInfo> SelectionChanged;
+        public Action<BeatmapGroup, BeatmapPanel> SelectionChanged;
 
         /// <summary>
         /// Fires when one of our difficulties is clicked when already selected. Should start playing the map.
@@ -89,8 +89,6 @@ namespace osu.Game.Beatmaps.Drawables
             //we want to make sure one of our children is selected in the case none have been selected yet.
             if (SelectedPanel == null)
                 BeatmapPanels.First().State = PanelSelectedState.Selected;
-            else
-                SelectionChanged?.Invoke(this, SelectedPanel.Beatmap);
         }
 
         private void panelGainedSelection(BeatmapPanel panel)
@@ -106,7 +104,7 @@ namespace osu.Game.Beatmaps.Drawables
             finally
             {
                 State = BeatmapGroupState.Expanded;
-                SelectionChanged?.Invoke(this, panel.Beatmap);
+                SelectionChanged?.Invoke(this, SelectedPanel);
             }
         }
     }

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -94,6 +94,9 @@ namespace osu.Game.Beatmaps
         {
             if (track != null && BeatmapInfo.AudioEquals(other.BeatmapInfo))
                 other.track = track;
+
+            if (background != null && BeatmapInfo.BackgroundEquals(other.BeatmapInfo))
+                other.background = background;
         }
 
         public virtual void Dispose()

osu.Game/Database/BeatmapInfo.cs

@@ -93,5 +93,9 @@ namespace osu.Game.Database
         public bool AudioEquals(BeatmapInfo other) => other != null && BeatmapSet != null && other.BeatmapSet != null &&
                                                       BeatmapSet.Path == other.BeatmapSet.Path &&
                                                       (Metadata ?? BeatmapSet.Metadata).AudioFile == (other.Metadata ?? other.BeatmapSet.Metadata).AudioFile;
+
+        public bool BackgroundEquals(BeatmapInfo other) => other != null && BeatmapSet != null && other.BeatmapSet != null &&
+                                                      BeatmapSet.Path == other.BeatmapSet.Path &&
+                                                      (Metadata ?? BeatmapSet.Metadata).BackgroundFile == (other.Metadata ?? other.BeatmapSet.Metadata).BackgroundFile;
     }
 }

osu.Game/Online/API/Requests/GetBeatmapDetailsRequest.cs

@@ -6,7 +6,7 @@ using osu.Game.Database;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetBeatmapDetailsRequest : APIRequest<GetBeatmapDeatilsResponse>
+    public class GetBeatmapDetailsRequest : APIRequest<GetBeatmapDetailsResponse>
     {
         private readonly BeatmapInfo beatmap;
 
@@ -20,7 +20,7 @@ namespace osu.Game.Online.API.Requests
         protected override string Target => $@"beatmaps/{lookupString}";
     }
 
-    public class GetBeatmapDeatilsResponse : BeatmapMetrics
+    public class GetBeatmapDetailsResponse : BeatmapMetrics
     {
         //the online API returns some metrics as a nested object.
         [JsonProperty(@"failtimes")]

osu.Game/Screens/Play/PlayerLoader.cs

@@ -14,6 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Menu;
 using OpenTK;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Screens.Play
 {
@@ -174,10 +175,17 @@ namespace osu.Game.Screens.Play
                         }
                     };
                 }
-
             }
 
+            private readonly WorkingBeatmap beatmap;
+
             public BeatmapMetadataDisplay(WorkingBeatmap beatmap)
+            {
+                this.beatmap = beatmap;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(LocalisationEngine localisation)
             {
                 var metadata = beatmap?.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
@@ -194,7 +202,7 @@ namespace osu.Game.Screens.Play
                         {
                             new OsuSpriteText
                             {
-                                Text = metadata.Title,
+                                Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title),
                                 TextSize = 36,
                                 Font = @"Exo2.0-MediumItalic",
                                 Origin = Anchor.TopCentre,
@@ -202,7 +210,7 @@ namespace osu.Game.Screens.Play
                             },
                             new OsuSpriteText
                             {
-                                Text = metadata.Artist,
+                                Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist),
                                 TextSize = 26,
                                 Font = @"Exo2.0-MediumItalic",
                                 Origin = Anchor.TopCentre,

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -120,7 +120,7 @@ namespace osu.Game.Screens.Select
 
         public void RemoveBeatmap(BeatmapSetInfo info) => removeGroup(groups.Find(b => b.BeatmapSet.ID == info.ID));
 
-        public Action<BeatmapGroup, BeatmapInfo> SelectionChanged;
+        public Action<BeatmapInfo> SelectionChanged;
 
         public Action StartRequested;
 
@@ -230,7 +230,7 @@ namespace osu.Game.Screens.Select
 
             return new BeatmapGroup(beatmapSet, database)
             {
-                SelectionChanged = SelectionChanged,
+                SelectionChanged = (g, p) => selectGroup(g, p),
                 StartRequested = b => StartRequested?.Invoke(),
                 State = BeatmapGroupState.Collapsed
             };
@@ -327,23 +327,35 @@ namespace osu.Game.Screens.Select
         }
 
         private void selectGroup(BeatmapGroup group, BeatmapPanel panel = null, bool animated = true)
+        {
+            try
             {
                 if (panel == null)
                     panel = group.BeatmapPanels.First();
 
+                if (selectedPanel == panel) return;
+
                 Trace.Assert(group.BeatmapPanels.Contains(panel), @"Selected panel must be in provided group");
 
                 if (selectedGroup != null && selectedGroup != group && selectedGroup.State != BeatmapGroupState.Hidden)
                     selectedGroup.State = BeatmapGroupState.Collapsed;
 
                 group.State = BeatmapGroupState.Expanded;
-            selectedGroup = group;
                 panel.State = PanelSelectedState.Selected;
-            selectedPanel = panel;
 
+                if (selectedPanel == panel) return;
+
+                selectedPanel = panel;
+                selectedGroup = group;
+
+                SelectionChanged?.Invoke(panel.Beatmap);
+            }
+            finally
+            {
                 float selectedY = computeYPositions(animated);
                 ScrollTo(selectedY, animated);
             }
+        }
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -74,12 +74,34 @@ namespace osu.Game.Screens.Select
             }
 
             State = Visibility.Visible;
-            var lastContainer = beatmapInfoContainer;
+            AlwaysPresent = true;
 
+            var lastContainer = beatmapInfoContainer;
             float newDepth = lastContainer?.Depth + 1 ?? 0;
 
+            Add(beatmapInfoContainer = new AsyncLoadWrapper(
+                new BufferedWedgeInfo(beatmap)
+                {
+                    Shear = -Shear,
+                    OnLoadComplete = d =>
+                    {
+                        FadeIn(250);
+
+                        lastContainer?.FadeOut(250);
+                        lastContainer?.Expire();
+                    }
+                })
+            {
+                Depth = newDepth,
+            });
+        }
+
+        public class BufferedWedgeInfo : BufferedContainer
+        {
+            public BufferedWedgeInfo(WorkingBeatmap beatmap)
+            {
                 BeatmapInfo beatmapInfo = beatmap.BeatmapInfo;
-            BeatmapMetadata metadata = beatmap.BeatmapInfo?.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
+                BeatmapMetadata metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
                 List<InfoLabel> labels = new List<InfoLabel>();
 
@@ -103,25 +125,13 @@ namespace osu.Game.Screens.Select
                     }));
 
                     //get statistics fromt he current ruleset.
-                labels.AddRange(beatmap.BeatmapInfo.Ruleset.CreateInstance().GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s)));
+                    labels.AddRange(beatmapInfo.Ruleset.CreateInstance().GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s)));
                 }
 
-            AlwaysPresent = true;
+                PixelSnapping = true;
+                CacheDrawnFrameBuffer = true;
+                RelativeSizeAxes = Axes.Both;
 
-            Add(beatmapInfoContainer = new AsyncLoadWrapper(
-                new BufferedContainer
-                {
-                    OnLoadComplete = d =>
-                    {
-                        FadeIn(250);
-
-                        lastContainer?.FadeOut(250);
-                        lastContainer?.Expire();
-                    },
-                    PixelSnapping = true,
-                    CacheDrawnFrameBuffer = true,
-                    Shear = -Shear,
-                    RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
                     // We will create the white-to-black gradient by modulating transparency and having
@@ -224,11 +234,7 @@ namespace osu.Game.Screens.Select
                             },
                         }
                     },
-                    }
+                };
-                })
-            {
-                Depth = newDepth,
-            });
             }
 
             private string getBPMRange(Beatmap beatmap)
@@ -310,3 +316,4 @@ namespace osu.Game.Screens.Select
             }
         }
     }
+}

osu.Game/Screens/Select/SongSelect.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Linq;
 using System.Threading;
 using OpenTK;
 using OpenTK.Input;
@@ -15,8 +14,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -197,6 +196,12 @@ namespace osu.Game.Screens.Select
 
         private void raiseSelect()
         {
+            var pendingSelection = selectionChangedDebounce;
+            selectionChangedDebounce = null;
+
+            pendingSelection?.RunTask();
+            pendingSelection?.Cancel(); // cancel the already scheduled task.
+
             if (Beatmap == null) return;
 
             OnSelected();
@@ -297,25 +302,37 @@ namespace osu.Game.Screens.Select
             carousel.SelectBeatmap(beatmap?.BeatmapInfo);
         }
 
+        private ScheduledDelegate selectionChangedDebounce;
+
+        // We need to keep track of the last selected beatmap ignoring debounce to play the correct selection sounds.
+        private BeatmapInfo selectionChangeNoBounce;
+
         /// <summary>
         /// selection has been changed as the result of interaction with the carousel.
         /// </summary>
-        private void selectionChanged(BeatmapGroup group, BeatmapInfo beatmap)
+        private void selectionChanged(BeatmapInfo beatmap)
         {
             bool beatmapSetChange = false;
 
             if (!beatmap.Equals(Beatmap?.BeatmapInfo))
             {
-                if (beatmap.BeatmapSetInfoID == Beatmap?.BeatmapInfo.BeatmapSetInfoID)
+                if (beatmap.BeatmapSetInfoID == selectionChangeNoBounce?.BeatmapSetInfoID)
                     sampleChangeDifficulty.Play();
                 else
                 {
                     sampleChangeBeatmap.Play();
                     beatmapSetChange = true;
                 }
-                Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap);
             }
+
+            selectionChangeNoBounce = beatmap;
+
+            selectionChangedDebounce?.Cancel();
+            selectionChangedDebounce = Scheduler.AddDelayed(delegate
+            {
+                Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap);
                 ensurePlayingSelected(beatmapSetChange);
+            }, 100);
         }
 
         private void ensurePlayingSelected(bool preview = false)
@@ -331,11 +348,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void selectBeatmap(BeatmapSetInfo beatmapSet = null)
-        {
-            carousel.SelectBeatmap(beatmapSet != null ? beatmapSet.Beatmaps.First() : Beatmap?.BeatmapInfo);
-        }
-
         private void removeBeatmapSet(BeatmapSetInfo beatmapSet)
         {
             carousel.RemoveBeatmap(beatmapSet);