Merge branch 'master' into fix-beatmap-select-race

osu-framework

@@ -1 +1 @@
-Subproject commit 6b44a9f807fadcb3b3f044780d7e27d62ffe80ac
+Subproject commit 2d2e2fe698ab32d80d5e856f52c8c398ceb35540

osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs

@@ -10,7 +10,7 @@ namespace osu.Desktop.VisualTests.Beatmaps
     public class TestWorkingBeatmap : WorkingBeatmap
     {
         public TestWorkingBeatmap(Beatmap beatmap)
-            : base(beatmap.BeatmapInfo, true)
+            : base(beatmap.BeatmapInfo)
         {
             this.beatmap = beatmap;
         }

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -22,17 +22,11 @@ namespace osu.Game.Beatmaps
 
         public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>(new Mod[] { });
 
-        /// <summary>
+        protected WorkingBeatmap(BeatmapInfo beatmapInfo)
-        /// Denotes whether extras like storyboards have been loaded for this <see cref="WorkingBeatmap"/>.
-        /// </summary>
-        public bool FullyLoaded { get; protected set; }
-
-        protected WorkingBeatmap(BeatmapInfo beatmapInfo, bool fullyLoaded = false)
         {
             BeatmapInfo = beatmapInfo;
             BeatmapSetInfo = beatmapInfo.BeatmapSet;
             Metadata = beatmapInfo.Metadata ?? BeatmapSetInfo.Metadata;
-            FullyLoaded = fullyLoaded;
 
             Mods.ValueChanged += mods => applyRateAdjustments();
         }

osu.Game/Database/BeatmapDatabase.cs

@@ -291,7 +291,7 @@ namespace osu.Game.Database
             if (beatmapInfo.Metadata == null)
                 beatmapInfo.Metadata = beatmapInfo.BeatmapSet.Metadata;
 
-            WorkingBeatmap working = new DatabaseWorkingBeatmap(this, beatmapInfo, withStoryboard);
+            WorkingBeatmap working = new DatabaseWorkingBeatmap(this, beatmapInfo);
 
             previous?.TransferTo(working);
 

osu.Game/Database/DatabaseWorkingBeatmap.cs

@@ -14,8 +14,8 @@ namespace osu.Game.Database
     {
         private readonly BeatmapDatabase database;
 
-        public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, bool fullyLoaded = false)
+        public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo)
-            : base(beatmapInfo, fullyLoaded)
+            : base(beatmapInfo)
         {
             this.database = database;
         }
@@ -37,7 +37,7 @@ namespace osu.Game.Database
                         beatmap = decoder.Decode(stream);
                     }
 
-                    if (beatmap == null || !FullyLoaded || BeatmapSetInfo.StoryboardFile == null)
+                    if (beatmap == null || BeatmapSetInfo.StoryboardFile == null)
                         return beatmap;
 
                     using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))

osu.Game/OsuGame.cs

@@ -175,11 +175,11 @@ namespace osu.Game
             LoadComponentAsync(direct = new DirectOverlay { Depth = -1 }, mainContent.Add);
             LoadComponentAsync(social = new SocialOverlay { Depth = -1 }, mainContent.Add);
             LoadComponentAsync(chat = new ChatOverlay { Depth = -1 }, mainContent.Add);
-            LoadComponentAsync(userProfile = new UserProfileOverlay { Depth = -1 }, mainContent.Add);
             LoadComponentAsync(settings = new SettingsOverlay { Depth = -1 }, overlayContent.Add);
+            LoadComponentAsync(userProfile = new UserProfileOverlay { Depth = -2 }, mainContent.Add);
             LoadComponentAsync(musicController = new MusicController
             {
-                Depth = -2,
+                Depth = -3,
                 Position = new Vector2(0, Toolbar.HEIGHT),
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
@@ -187,14 +187,14 @@ namespace osu.Game
 
             LoadComponentAsync(notificationManager = new NotificationManager
             {
-                Depth = -2,
+                Depth = -3,
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
             }, overlayContent.Add);
 
             LoadComponentAsync(dialogOverlay = new DialogOverlay
             {
-                Depth = -4,
+                Depth = -5,
             }, overlayContent.Add);
 
             Logger.NewEntry += entry =>
@@ -221,7 +221,7 @@ namespace osu.Game
 
             LoadComponentAsync(Toolbar = new Toolbar
             {
-                Depth = -3,
+                Depth = -4,
                 OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); },
             }, overlayContent.Add);
 

osu.Game/OsuGameBase.cs

@@ -133,9 +133,27 @@ namespace osu.Game
                 Token = LocalConfig.Get<string>(OsuSetting.Token)
             });
 
+            Beatmap.ValueChanged += b =>
+            {
+                // compare to last baetmap as sometimes the two may share a track representation (optimisation, see WorkingBeatmap.TransferTo)
+                if (lastBeatmap?.Track != b.Track)
+                {
+                    // this disposal is done to stop the audio track.
+                    // it may not be exactly what we want for cases beatmaps are reused, as it will
+                    // trigger a fresh load of contained resources.
+                    lastBeatmap?.Dispose();
+
+                    Audio.Track.AddItem(b.Track);
+                }
+
+                lastBeatmap = b;
+            };
+
             API.Register(this);
         }
 
+        private WorkingBeatmap lastBeatmap;
+
         public void APIStateChanged(APIAccess api, APIState state)
         {
             switch (state)

osu.Game/Overlays/Chat/ChatLine.cs

@@ -1,6 +1,7 @@
 // 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;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -11,6 +12,7 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
+using osu.Game.Users;
 
 namespace osu.Game.Overlays.Chat
 {
@@ -62,6 +64,8 @@ namespace osu.Game.Overlays.Chat
         private const float message_padding = 200;
         private const float text_size = 20;
 
+        private Action<User> loadProfile;
+
         private Color4 customUsernameColour;
 
         public ChatLine(Message message)
@@ -75,9 +79,10 @@ namespace osu.Game.Overlays.Chat
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, UserProfileOverlay profile)
         {
             customUsernameColour = colours.ChatBlue;
+            loadProfile = u => profile?.ShowUser(u);
         }
 
         protected override void LoadComplete()
@@ -87,8 +92,6 @@ namespace osu.Game.Overlays.Chat
             bool hasBackground = !string.IsNullOrEmpty(Message.Sender.Colour);
             Drawable username = new OsuSpriteText
             {
-                Origin = Anchor.TopRight,
-                Anchor = Anchor.TopRight,
                 Font = @"Exo2.0-BoldItalic",
                 Text = $@"{Message.Sender.Username}" + (hasBackground ? "" : ":"),
                 Colour = hasBackground ? customUsernameColour : username_colours[Message.UserId % username_colours.Length],
@@ -132,7 +135,7 @@ namespace osu.Game.Overlays.Chat
                 new Container
                 {
                     Size = new Vector2(message_padding, text_size),
-                    Children = new[]
+                    Children = new Drawable[]
                     {
                         new OsuSpriteText
                         {
@@ -144,7 +147,14 @@ namespace osu.Game.Overlays.Chat
                             TextSize = text_size * 0.75f,
                             Alpha = 0.4f,
                         },
-                        username
+                        new ClickableContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Origin = Anchor.TopRight,
+                            Anchor = Anchor.TopRight,
+                            Child = username,
+                            Action = () => loadProfile(Message.Sender),
+                        },
                     }
                 },
                 new Container

osu.Game/Overlays/Music/PlaylistOverlay.cs

@@ -3,9 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -15,7 +13,6 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Extensions;
 using osu.Framework.Input;
 using osu.Framework.Graphics.Shapes;
 
@@ -30,7 +27,6 @@ namespace osu.Game.Overlays.Music
         private FilterControl filter;
         private PlaylistList list;
 
-        private TrackManager trackManager;
         private BeatmapDatabase beatmaps;
 
         private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
@@ -43,7 +39,6 @@ namespace osu.Game.Overlays.Music
         {
             this.inputManager = inputManager;
             this.beatmaps = beatmaps;
-            trackManager = game.Audio.Track;
 
             Children = new Drawable[]
             {
@@ -154,13 +149,7 @@ namespace osu.Game.Overlays.Music
         private void playSpecified(BeatmapInfo info)
         {
             beatmapBacking.Value = beatmaps.GetWorkingBeatmap(info, beatmapBacking);
-
+            beatmapBacking.Value.Track.Start();
-            Task.Run(() =>
-            {
-                var track = beatmapBacking.Value.Track;
-                trackManager.SetExclusive(track);
-                track.Start();
-            }).ContinueWith(task => Schedule(task.ThrowIfFaulted), TaskContinuationOptions.OnlyOnFaulted);
         }
     }
 

osu.Game/Overlays/Profile/ProfileHeader.cs

@@ -12,16 +12,20 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
+using System.Diagnostics;
+using System.Globalization;
 
 namespace osu.Game.Overlays.Profile
 {
     public class ProfileHeader : Container
     {
-        private readonly OsuTextFlowContainer infoTextLeft, infoTextRight;
+        private readonly OsuTextFlowContainer infoTextLeft;
+        private readonly LinkFlowContainer infoTextRight;
         private readonly FillFlowContainer<SpriteText> scoreText, scoreNumberText;
 
         private readonly Container coverContainer, chartContainer, supporterTag;
@@ -29,6 +33,7 @@ namespace osu.Game.Overlays.Profile
         private readonly SpriteText levelText;
         private readonly GradeBadge gradeSSPlus, gradeSS, gradeSPlus, gradeS, gradeA;
         private readonly Box colourBar;
+        private readonly DrawableFlag countryFlag;
 
         private const float cover_height = 350;
         private const float info_height = 150;
@@ -114,16 +119,17 @@ namespace osu.Game.Overlays.Profile
                                                 }
                                             }
                                         },
-                                        new OsuSpriteText
+                                        new LinkFlowContainer.LinkText
                                         {
                                             Text = user.Username,
+                                            Url = $@"https://osu.ppy.sh/users/{user.Id}",
                                             TextSize = 30,
                                             Font = @"Exo2.0-RegularItalic",
                                             Anchor = Anchor.BottomLeft,
                                             Origin = Anchor.BottomLeft,
                                             Y = -48
                                         },
-                                        new DrawableFlag(user.Country?.FlagName ?? "__")
+                                        countryFlag = new DrawableFlag(user.Country?.FlagName ?? "__")
                                         {
                                             Anchor = Anchor.BottomLeft,
                                             Origin = Anchor.BottomLeft,
@@ -158,7 +164,7 @@ namespace osu.Game.Overlays.Profile
                     ParagraphSpacing = 0.8f,
                     LineSpacing = 0.2f
                 },
-                infoTextRight = new OsuTextFlowContainer(t =>
+                infoTextRight = new LinkFlowContainer(t =>
                 {
                     t.TextSize = 14;
                     t.Font = @"Exo2.0-RegularItalic";
@@ -350,6 +356,7 @@ namespace osu.Game.Overlays.Profile
             {
                 infoTextLeft.AddText("from ");
                 infoTextLeft.AddText(user.Country.FullName, boldItalic);
+                countryFlag.FlagName = user.Country.FlagName;
             }
             infoTextLeft.NewParagraph();
 
@@ -373,14 +380,22 @@ namespace osu.Game.Overlays.Profile
                 infoTextLeft.AddText(string.Join(", ", user.PlayStyle), boldItalic);
             }
 
+            string websiteWithoutProtcol = user.Website;
+            if (!string.IsNullOrEmpty(websiteWithoutProtcol))
+            {
+                int protocolIndex = websiteWithoutProtcol.IndexOf("//", StringComparison.Ordinal);
+                if (protocolIndex >= 0)
+                    websiteWithoutProtcol = websiteWithoutProtcol.Substring(protocolIndex + 2);
+            }
+
             tryAddInfoRightLine(FontAwesome.fa_map_marker, user.Location);
             tryAddInfoRightLine(FontAwesome.fa_heart_o, user.Intrerests);
             tryAddInfoRightLine(FontAwesome.fa_suitcase, user.Occupation);
             infoTextRight.NewParagraph();
             if (!string.IsNullOrEmpty(user.Twitter))
-                tryAddInfoRightLine(FontAwesome.fa_twitter, "@" + user.Twitter);
+                tryAddInfoRightLine(FontAwesome.fa_twitter, "@" + user.Twitter, $@"https://twitter.com/{user.Twitter}");
-            tryAddInfoRightLine(FontAwesome.fa_globe, user.Website);
+            tryAddInfoRightLine(FontAwesome.fa_globe, websiteWithoutProtcol, user.Website);
-            tryAddInfoRightLine(FontAwesome.fa_skype, user.Skype);
+            tryAddInfoRightLine(FontAwesome.fa_skype, user.Skype, @"skype:" + user.Skype + @"?chat");
 
             if (user.Statistics != null)
             {
@@ -390,7 +405,7 @@ namespace osu.Game.Overlays.Profile
                 scoreText.Add(createScoreText("Ranked Score"));
                 scoreNumberText.Add(createScoreNumberText(user.Statistics.RankedScore.ToString(@"#,0")));
                 scoreText.Add(createScoreText("Accuracy"));
-                scoreNumberText.Add(createScoreNumberText($"{user.Statistics.Accuracy}%"));
+                scoreNumberText.Add(createScoreNumberText($"{user.Statistics.Accuracy.ToString("0.##", CultureInfo.CurrentCulture)}%"));
                 scoreText.Add(createScoreText("Play Count"));
                 scoreNumberText.Add(createScoreNumberText(user.Statistics.PlayCount.ToString(@"#,0")));
                 scoreText.Add(createScoreText("Total Score"));
@@ -433,12 +448,12 @@ namespace osu.Game.Overlays.Profile
             Text = text
         };
 
-        private void tryAddInfoRightLine(FontAwesome icon, string str)
+        private void tryAddInfoRightLine(FontAwesome icon, string str, string url = null)
         {
             if (string.IsNullOrEmpty(str)) return;
 
             infoTextRight.AddIcon(icon);
-            infoTextRight.AddText(" " + str);
+            infoTextRight.AddLink(" " + str, url);
             infoTextRight.NewLine();
         }
 
@@ -479,5 +494,51 @@ namespace osu.Game.Overlays.Profile
                 badge.Texture = textures.Get($"Grades/{grade}");
             }
         }
+
+        private class LinkFlowContainer : OsuTextFlowContainer
+        {
+            public override bool HandleInput => true;
+
+            public LinkFlowContainer(Action<SpriteText> defaultCreationParameters = null) : base(defaultCreationParameters)
+            {
+            }
+
+            protected override SpriteText CreateSpriteText() => new LinkText();
+
+            public void AddLink(string text, string url) => AddText(text, link => ((LinkText)link).Url = url);
+
+            public class LinkText : OsuSpriteText
+            {
+                public override bool HandleInput => Url != null;
+
+                public string Url;
+
+                private Color4 hoverColour;
+
+                protected override bool OnHover(InputState state)
+                {
+                    FadeColour(hoverColour, 500, EasingTypes.OutQuint);
+                    return base.OnHover(state);
+                }
+
+                protected override void OnHoverLost(InputState state)
+                {
+                    FadeColour(Color4.White, 500, EasingTypes.OutQuint);
+                    base.OnHoverLost(state);
+                }
+
+                protected override bool OnClick(InputState state)
+                {
+                    Process.Start(Url);
+                    return true;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(OsuColour colours)
+                {
+                    hoverColour = colours.Yellow;
+                }
+            }
+        }
     }
 }

osu.Game/Screens/Menu/Intro.cs

@@ -72,8 +72,6 @@ namespace osu.Game.Screens.Menu
             menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            var trackManager = audio.Track;
-
             BeatmapSetInfo setInfo = null;
 
             if (!menuMusic)
@@ -106,7 +104,6 @@ namespace osu.Game.Screens.Menu
             Beatmap.Value = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
 
             track = Beatmap.Value.Track;
-            trackManager.SetExclusive(track);
 
             welcome = audio.Sample.Get(@"welcome");
             seeya = audio.Sample.Get(@"seeya");

osu.Game/Screens/Play/Player.cs

@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Play
         private bool loadedSuccessfully => HitRenderer?.Objects.Any() == true;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager config, OsuGame osu)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGame osu)
         {
             dimLevel = config.GetBindable<double>(OsuSetting.DimLevel);
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
@@ -81,10 +81,6 @@ namespace osu.Game.Screens.Play
 
             try
             {
-                if (!Beatmap.Value.FullyLoaded)
-                    // we need to ensure extras like storyboards are loaded.
-                    Beatmap.Value = beatmaps.GetWorkingBeatmap(Beatmap.Value.BeatmapInfo, withStoryboard: true);
-
                 if (Beatmap.Value.Beatmap == null)
                     throw new InvalidOperationException("Beatmap was not loaded");
 
@@ -119,10 +115,7 @@ namespace osu.Game.Screens.Play
             Track track = Beatmap.Value.Track;
 
             if (track != null)
-            {
-                audio.Track.SetExclusive(track);
                 adjustableSourceClock = track;
-            }
 
             adjustableSourceClock = (IAdjustableClock)track ?? new StopwatchClock();
 

osu.Game/Screens/Select/Footer.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
@@ -31,7 +32,7 @@ namespace osu.Game.Screens.Select
         public Action OnBack;
         public Action OnStart;
 
-        private readonly FillFlowContainer buttons;
+        private readonly FillFlowContainer<FooterButton> buttons;
 
         public OsuLogo StartButton;
 
@@ -43,9 +44,7 @@ namespace osu.Game.Screens.Select
         /// <para>Higher depth to be put on the left, and lower to be put on the right.</para>
         /// <para>Notice this is different to <see cref="Options.BeatmapOptionsOverlay"/>!</para>
         /// </param>
-        public void AddButton(string text, Color4 colour, Action action, Key? hotkey = null, float depth = 0)
+        public void AddButton(string text, Color4 colour, Action action, Key? hotkey = null, float depth = 0) => buttons.Add(new FooterButton
-        {
-            var button = new FooterButton
         {
             Text = text,
             Height = play_song_select_button_height,
@@ -54,18 +53,12 @@ namespace osu.Game.Screens.Select
             SelectedColour = colour,
             DeselectedColour = colour.Opacity(0.5f),
             Hotkey = hotkey,
-            };
+            Hovered = updateModeLight,
+            HoverLost = updateModeLight,
+            Action = action,
+        });
 
-            button.Hovered = () => updateModeLight(button);
+        private void updateModeLight() => modeLight.FadeColour(buttons.FirstOrDefault(b => b.IsHovered)?.SelectedColour ?? Color4.Transparent, TRANSITION_LENGTH, EasingTypes.OutQuint);
-            button.HoverLost = () => updateModeLight();
-            button.Action = action;
-            buttons.Add(button);
-        }
-
-        private void updateModeLight(FooterButton button = null)
-        {
-            modeLight.FadeColour(button?.SelectedColour ?? Color4.Transparent, TRANSITION_LENGTH, EasingTypes.OutQuint);
-        }
 
         public Footer()
         {
@@ -111,7 +104,7 @@ namespace osu.Game.Screens.Select
                     Spacing = new Vector2(padding, 0),
                     Children = new Drawable[]
                     {
-                        buttons = new FillFlowContainer
+                        buttons = new FillFlowContainer<FooterButton>
                         {
                             Direction = FillDirection.Horizontal,
                             Spacing = new Vector2(0.2f, 0),

osu.Game/Screens/Select/SongSelect.cs

@@ -32,7 +32,6 @@ namespace osu.Game.Screens.Select
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap();
 
         private readonly BeatmapCarousel carousel;
-        private TrackManager trackManager;
         private DialogOverlay dialogOverlay;
 
         private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 245);
@@ -174,7 +173,6 @@ namespace osu.Game.Screens.Select
             database.BeatmapSetAdded += onBeatmapSetAdded;
             database.BeatmapSetRemoved += onBeatmapSetRemoved;
 
-            trackManager = audio.Track;
             dialogOverlay = dialog;
 
             sampleChangeDifficulty = audio.Sample.Get(@"SongSelect/select-difficulty");
@@ -223,12 +221,17 @@ namespace osu.Game.Screens.Select
         private void carouselSelectionChanged(BeatmapInfo beatmap)
         {
             Action performLoad = delegate
+            {
+                // We may be arriving here due to another component changing the bindable Beatmap.
+                // In these cases, the other component has already loaded the beatmap, so we don't need to do so again.
+                if (beatmap?.Equals(Beatmap.Value.BeatmapInfo) != true)
                 {
                     bool preview = beatmap?.BeatmapSetInfoID != Beatmap.Value.BeatmapInfo.BeatmapSetInfoID;
 
                     Beatmap.Value = database.GetWorkingBeatmap(beatmap, Beatmap);
-
                     ensurePlayingSelected(preview);
+                }
+
                 changeBackground(Beatmap.Value);
             };
 
@@ -361,11 +364,12 @@ namespace osu.Game.Screens.Select
         {
             Track track = Beatmap.Value.Track;
 
-            trackManager.SetExclusive(track);
+            if (!track.IsRunning)
-
+            {
                 if (preview) track.Seek(Beatmap.Value.Metadata.PreviewTime);
                 track.Start();
             }
+        }
 
         private void removeBeatmapSet(BeatmapSetInfo beatmapSet)
         {