mirror of
https://github.com/osukey/osukey.git
synced 2025-05-30 01:47:30 +09:00
Merge pull request #249 from ColdVolcano/preview-time
Add Preview Time on selection of beatmap
This commit is contained in:
commit
d39da80b1b
@ -279,20 +279,23 @@ namespace osu.Game.Screens.Select
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void selectionChanged(BeatmapGroup group, BeatmapInfo beatmap)
|
private void selectionChanged(BeatmapGroup group, BeatmapInfo beatmap)
|
||||||
{
|
{
|
||||||
|
bool beatmapSetChange = false;
|
||||||
|
|
||||||
if (!beatmap.Equals(Beatmap?.BeatmapInfo))
|
if (!beatmap.Equals(Beatmap?.BeatmapInfo))
|
||||||
{
|
{
|
||||||
if (beatmap.BeatmapSetID == Beatmap?.BeatmapInfo.BeatmapSetID)
|
if (beatmap.BeatmapSetID == Beatmap?.BeatmapInfo.BeatmapSetID)
|
||||||
sampleChangeDifficulty.Play();
|
sampleChangeDifficulty.Play();
|
||||||
else
|
else
|
||||||
|
{
|
||||||
sampleChangeBeatmap.Play();
|
sampleChangeBeatmap.Play();
|
||||||
|
beatmapSetChange = true;
|
||||||
|
}
|
||||||
Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap);
|
Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap);
|
||||||
}
|
}
|
||||||
|
ensurePlayingSelected(beatmapSetChange);
|
||||||
ensurePlayingSelected();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ensurePlayingSelected()
|
private async Task ensurePlayingSelected(bool preview = false)
|
||||||
{
|
{
|
||||||
AudioTrack track = null;
|
AudioTrack track = null;
|
||||||
|
|
||||||
@ -303,6 +306,8 @@ namespace osu.Game.Screens.Select
|
|||||||
if (track != null)
|
if (track != null)
|
||||||
{
|
{
|
||||||
trackManager.SetExclusive(track);
|
trackManager.SetExclusive(track);
|
||||||
|
if (preview)
|
||||||
|
track.Seek(Beatmap.Beatmap.Metadata.PreviewTime);
|
||||||
track.Start();
|
track.Start();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user