h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 12:42:54 +08:00
Code Issues Releases Wiki Activity

More robust metadata handling.

Browse Source
This commit is contained in:
Huo Yaoyuan 2016-11-07 23:12:49 +08:00
parent fd977cacb3
commit ef5968e243
2 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Database/BeatmapInfo.cs
View File

@ -70,6 +70,8 @@ namespace osu.Game.Database
return BeatmapID == other?.BeatmapID; return BeatmapID == other?.BeatmapID;
} }
public bool AudioEquals(BeatmapInfo other) => BeatmapSet.Path == other.BeatmapSet.Path && Metadata.AudioFile == other.Metadata.AudioFile; public bool AudioEquals(BeatmapInfo other) => other != null &&
BeatmapSet.Path == other.BeatmapSet.Path &&
(Metadata ?? BeatmapSet.Metadata).AudioFile == (other.Metadata ?? other.BeatmapSet.Metadata).AudioFile;
} }
} }

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

@ -260,7 +260,7 @@ namespace osu.Game.Overlays
nextToPlay = playList[playListIndex++].Beatmaps[0]; nextToPlay = playList[playListIndex++].Beatmaps[0];
if (playListIndex == playList.Count) playListIndex = 0; if (playListIndex == playList.Count) playListIndex = 0;
} }
while (current?.BeatmapInfo.AudioEquals(nextToPlay) == true); while (nextToPlay.AudioEquals(current?.BeatmapInfo));
play(nextToPlay, true); play(nextToPlay, true);
appendToHistory(nextToPlay); appendToHistory(nextToPlay);