Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Follow-up to #38: loop tracks on states by default.

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-03-07 19:04:45 -05:00
parent 447fd93e60
commit 8c24ef97c7
10 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/itdelatrisu/opsu/audio/MusicController.java
View File

@@ -70,9 +70,8 @@ public class MusicController {
* @param osu the OsuFile to play
* @param loop whether or not to loop the track
* @param preview whether to start at the preview time (true) or beginning (false)
* @param reset plays at the preview time even if it has the same preview time as the last
*/
public static void play(final OsuFile osu, final boolean loop, final boolean preview, final boolean reset) {
public static void play(final OsuFile osu, final boolean loop, final boolean preview) {
// new track: load and play
if (lastOsu == null || !osu.audioFilename.equals(lastOsu.audioFilename)) {
reset();
@@ -95,7 +94,7 @@ public class MusicController {
}
// new track position: play at position
else if (osu.previewTime != lastOsu.previewTime || reset)
else if (osu.previewTime != lastOsu.previewTime)
playAt(osu.previewTime, loop);
lastOsu = osu;
@@ -277,13 +276,22 @@ public class MusicController {
*/
public static boolean trackEnded() { return trackEnded; }
/**
* Loops the current track if it has ended.
* @param preview whether to start at the preview time (true) or beginning (false)
*/
public static void loopTrackIfEnded(boolean preview) {
if (trackEnded && trackExists())
playAt((preview) ? lastOsu.previewTime : 0, false);
}
/**
* Plays the theme song.
*/
public static void playThemeSong() {
OsuFile osu = Options.getOsuTheme();
if (osu != null) {
play(osu, true, false, false);
play(osu, true, false);
themePlaying = true;
}
}