sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make prev and next work again.

Browse Source
This commit is contained in:
Huo Yaoyuan
2016-10-28 20:08:27 +08:00
parent b7ada4866e
commit 7d14e6e6cf
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
View File

@ -34,7 +34,6 @@ namespace osu.Desktop.Tests
{ {
base.Reset(); base.Reset();
ourClock.ProcessFrame(); ourClock.ProcessFrame();
mc?.CurrentTrack?.Stop();
mc = new MusicController mc = new MusicController
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,

30
osu.Game/Overlays/MusicController.cs
View File

@ -186,6 +186,10 @@ namespace osu.Game.Overlays
playButton.Icon = FontAwesome.pause; playButton.Icon = FontAwesome.pause;
updateCurrent(beatmapSource, null); updateCurrent(beatmapSource, null);
} }
else if (playList.Count > 0)
{
play(playList[0].Beatmaps[0], null);
}
} }
protected override void Update() protected override void Update()
@ -196,22 +200,36 @@ namespace osu.Game.Overlays
if (CurrentTrack.HasCompleted) next(); if (CurrentTrack.HasCompleted) next();
} }
private int findInPlaylist(Beatmap beatmap)
{
if (beatmap == null) return -1;
for (int i = 0; i < playList.Count; i++)
if (beatmap.BeatmapInfo.BeatmapSetID == playList[i].BeatmapSetID)
return i;
return -1;
}
private void prev() private void prev()
{ {
int i = playList.IndexOf(currentPlay); int i = findInPlaylist(beatmapSource.Value?.Beatmap);
if (i == -1) return; if (i == -1) return;
i = (i - 1 + playList.Count) % playList.Count; i = (i - 1 + playList.Count) % playList.Count;
currentPlay = playList[i]; play(playList[i].Beatmaps[0], false);
play(currentPlay, false);
} }
private void next() private void next()
{ {
int i = playList.IndexOf(currentPlay); int i = findInPlaylist(beatmapSource.Value?.Beatmap);
if (i == -1) return; if (i == -1) return;
i = (i + 1) % playList.Count; i = (i + 1) % playList.Count;
currentPlay = playList[i]; play(playList[i].Beatmaps[0], true);
play(currentPlay, true); }
private void play(BeatmapInfo info, bool? isNext)
{
WorkingBeatmap working = database.GetWorkingBeatmap(info, beatmapSource.Value);
beatmapSource.Value = working;
updateCurrent(working, isNext);
} }
private void updateCurrent(WorkingBeatmap beatmap, bool? isNext) private void updateCurrent(WorkingBeatmap beatmap, bool? isNext)