From a845a897b3e720de5cad7b3889246cfcffefed26 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 15 Dec 2016 17:11:48 -0600 Subject: [PATCH 1/3] Add Base Preview Time --- osu.Game/Screens/Select/PlaySongSelect.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 9d2debb8aa..1496727469 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -279,20 +279,28 @@ namespace osu.Game.Screens.Select /// private void selectionChanged(BeatmapGroup group, BeatmapInfo beatmap) { + bool beatmapSetChange = false; if (!beatmap.Equals(Beatmap?.BeatmapInfo)) { if (beatmap.BeatmapSetID == Beatmap?.BeatmapInfo.BeatmapSetID) + { sampleChangeDifficulty.Play(); + beatmapSetChange = false; + } else + { sampleChangeBeatmap.Play(); + beatmapSetChange = true; + + } Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap); } - - ensurePlayingSelected(); + + ensurePlayingSelected(beatmapSetChange); } - private async Task ensurePlayingSelected() + private async Task ensurePlayingSelected(bool preview = false) { AudioTrack track = null; @@ -303,6 +311,8 @@ namespace osu.Game.Screens.Select if (track != null) { trackManager.SetExclusive(track); + if (preview) + track.Seek(Beatmap.Beatmap.Metadata.PreviewTime); track.Start(); } }); From b788878c95f8756825967990bea141577a0a5a36 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 15 Dec 2016 17:28:22 -0600 Subject: [PATCH 2/3] Unnecesary things were removed (I guess) --- osu.Game/Screens/Select/PlaySongSelect.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 1496727469..7eae136d5e 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -280,23 +280,19 @@ namespace osu.Game.Screens.Select private void selectionChanged(BeatmapGroup group, BeatmapInfo beatmap) { bool beatmapSetChange = false; + if (!beatmap.Equals(Beatmap?.BeatmapInfo)) { if (beatmap.BeatmapSetID == Beatmap?.BeatmapInfo.BeatmapSetID) - { sampleChangeDifficulty.Play(); - beatmapSetChange = false; - } else { sampleChangeBeatmap.Play(); beatmapSetChange = true; - } - Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap); } - + ensurePlayingSelected(beatmapSetChange); } From d37ff8f153d9762fe7eab53e31b4171bb01b56da Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 15 Dec 2016 17:35:14 -0600 Subject: [PATCH 3/3] Deleted unnecesary things (I guess) --- osu.Game/Screens/Select/PlaySongSelect.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 7eae136d5e..bc9c983352 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -292,7 +292,6 @@ namespace osu.Game.Screens.Select } Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap); } - ensurePlayingSelected(beatmapSetChange); }