From 4be8899fb29b70ed7edace67c731d699cc3ebd2f Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Mon, 11 Sep 2017 02:55:32 -0300 Subject: [PATCH] Move Length to BeatmapOnlineInfo. --- .../Visual/TestCaseOnlineBeatmapSetOverlay.cs | 6 +++++- osu.Game/Beatmaps/BeatmapOnlineInfo.cs | 5 +++++ osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs | 5 ----- osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs | 8 +++----- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/osu.Desktop.Tests/Visual/TestCaseOnlineBeatmapSetOverlay.cs b/osu.Desktop.Tests/Visual/TestCaseOnlineBeatmapSetOverlay.cs index 2d26c6c518..5bec99e5a5 100644 --- a/osu.Desktop.Tests/Visual/TestCaseOnlineBeatmapSetOverlay.cs +++ b/osu.Desktop.Tests/Visual/TestCaseOnlineBeatmapSetOverlay.cs @@ -46,7 +46,6 @@ namespace osu.Desktop.VisualTests.Tests FavouriteCount = 356, Submitted = new DateTime(2016, 2, 10), Ranked = new DateTime(2016, 6, 19), - Length = 118000, BPM = 236, Author = new User { @@ -75,6 +74,7 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapOnlineInfo { + Length = 115000, HasVideo = false, CircleCount = 265, SliderCount = 71, @@ -103,6 +103,7 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapOnlineInfo { + Length = 118000, HasVideo = false, CircleCount = 592, SliderCount = 62, @@ -131,6 +132,7 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapOnlineInfo { + Length = 118000, HasVideo = false, CircleCount = 1042, SliderCount = 79, @@ -159,6 +161,7 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapOnlineInfo { + Length = 118000, HasVideo = false, CircleCount = 1352, SliderCount = 69, @@ -187,6 +190,7 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapOnlineInfo { + Length = 118000, HasVideo = false, CircleCount = 1730, SliderCount = 115, diff --git a/osu.Game/Beatmaps/BeatmapOnlineInfo.cs b/osu.Game/Beatmaps/BeatmapOnlineInfo.cs index c9794107ce..399cabda99 100644 --- a/osu.Game/Beatmaps/BeatmapOnlineInfo.cs +++ b/osu.Game/Beatmaps/BeatmapOnlineInfo.cs @@ -10,6 +10,11 @@ namespace osu.Game.Beatmaps /// public class BeatmapOnlineInfo { + /// + /// The length in milliseconds of this beatmap's song. + /// + public double Length { get; set; } + /// /// Whether or not this beatmap has a background video. /// diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs index 8009ea5b9e..b53aee9661 100644 --- a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs +++ b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs @@ -44,11 +44,6 @@ namespace osu.Game.Beatmaps [JsonProperty(@"previewUrl")] public string Preview { get; set; } - /// - /// The length in milliseconds of this beatmap's song. - /// - public double Length { get; set; } - /// /// The beats per minute of this beatmap set's song. /// diff --git a/osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs b/osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs index fa45a04b40..d5acfd2e43 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs +++ b/osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs @@ -25,6 +25,8 @@ namespace osu.Game.Overlays.OnlineBeatmapSet { if (value == beatmap) return; beatmap = value; + + length.Value = TimeSpan.FromMilliseconds(beatmap.OnlineInfo.Length).ToString(@"m\:ss"); circleCount.Value = string.Format(@"{0:n0}", beatmap.OnlineInfo.CircleCount); sliderCount.Value = string.Format(@"{0:n0}", beatmap.OnlineInfo.SliderCount); } @@ -40,11 +42,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet Direction = FillDirection.Horizontal, Children = new[] { - length = new Statistic(FontAwesome.fa_clock_o, "Length") - { - Width = statWidth, - Value = TimeSpan.FromMilliseconds(set.OnlineInfo.Length).ToString(@"m\:ss"), - }, + length = new Statistic(FontAwesome.fa_clock_o, "Length") { Width = statWidth }, bpm = new Statistic(FontAwesome.fa_circle, "BPM") { Width = statWidth,