move the method to get the beat progress to MusicController

src/itdelatrisu/opsu/audio/MusicController.java

@@ -22,6 +22,7 @@ import itdelatrisu.opsu.ErrorHandler;
 import itdelatrisu.opsu.Options;
 import itdelatrisu.opsu.beatmap.Beatmap;
 import itdelatrisu.opsu.beatmap.BeatmapParser;
+import itdelatrisu.opsu.beatmap.TimingPoint;
 import itdelatrisu.opsu.states.Game;
 import itdelatrisu.opsu.ui.UI;
 
@@ -184,6 +185,49 @@ public class MusicController {
 	 */
 	public static Beatmap getBeatmap() { return lastBeatmap; }
 
+	private static float lastBeatLength;
+
+	/**
+	 * Gets the progress of the current beat.
+	 * @return progress as a value in [0, 1], where 0 means a beat just happend and 1 means the next beat is coming now.
+	 */
+	public static Double getBeatProgress() {
+		if (!isPlaying() || getBeatmap() == null) {
+			return null;
+		}
+		Beatmap map = getBeatmap();
+		if (map.timingPoints == null) {
+			return null;
+		}
+		int trackposition = getPosition();
+		TimingPoint p = null;
+		float beatlen = 0f;
+		int time = 0;
+		for (TimingPoint pts : map.timingPoints) {
+			if (p == null || pts.getTime() < getPosition()) {
+				p = pts;
+				if (!p.isInherited() && p.getBeatLength() > 0) {
+					beatlen = p.getBeatLength();
+					time = p.getTime();
+				}
+			}
+		}
+		if (p == null) {
+			return null;
+		}
+		lastBeatLength = beatlen;
+		double beatLength = beatlen * 100;
+		return (((trackposition * 100 - time * 100) % beatLength) / beatLength);
+	}
+
+	/**
+	 * Get the length of the last beat
+	 * @return the length of the last beat
+	 */
+	private float getLastBeatLength() {
+		return lastBeatLength;
+	}
+
 	/**
 	 * Returns true if the current track is playing.
 	 */

src/itdelatrisu/opsu/states/MainMenu.java

@@ -273,7 +273,7 @@ public class MainMenu extends BasicGameState {
 			exitButton.draw();
 		}
 
-		Double position = getBPMPiecePosition();
+		Double position = MusicController.getBeatProgress();
 
 		if (position != null) {
 			double scale = 1 - (0 - position) * 0.05;
@@ -361,34 +361,6 @@ public class MainMenu extends BasicGameState {
 		UI.draw(g);
 	}
 
-	private Double getBPMPiecePosition() {
-		if (!MusicController.isPlaying() || MusicController.getBeatmap() == null) {
-			return null;
-		}
-		Beatmap map = MusicController.getBeatmap();
-		if (map.timingPoints == null) {
-			return null;
-		}
-		int trackposition = MusicController.getPosition();
-		TimingPoint p = null;
-		float beatlen = 0f;
-		int time = 0;
-		for (TimingPoint pts : map.timingPoints) {
-			if (p == null || pts.getTime() < MusicController.getPosition()) {
-				p = pts;
-				if (!p.isInherited() && p.getBeatLength() > 0) {
-					beatlen = p.getBeatLength();
-					time = p.getTime();
-				}
-			}
-		}
-		if (p == null) {
-			return null;
-		}
-		double beatLength = beatlen * 100;
-		return (((trackposition * 100 - time * 100) % beatLength) / beatLength);
-	}
-
 	@Override
 	public void update(GameContainer container, StateBasedGame game, int delta)
 			throws SlickException {