Minor updates and code improvements.

- MusicController.getPosition() now returns time even when track is paused. (e.g. song progress bar in main menu won't reset when paused)
- Force unpause track when entering the song menu.
- Rewrote Game.RESTART_* constants as enums.
- Cleaned up logo play/exit button scaling.
- MainMenu.previous is now non-static.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>

src/itdelatrisu/opsu/audio/MusicController.java

@@ -66,6 +66,11 @@ public class MusicController {
 	 */
 	private static boolean themePlaying = false;
 
+	/**
+	 * Track pause time.
+	 */
+	private static float pauseTime = 0f;
+
 	// This class should not be instantiated.
 	private MusicController() {}
 
@@ -141,6 +146,7 @@ public class MusicController {
 				player.loop();
 			else
 				player.play();
+			pauseTime = 0f;
 		}
 	}
 
@@ -205,12 +211,21 @@ public class MusicController {
 		return (trackExists() && player.playing());
 	}
 
+	/**
+	 * Returns true if the current track is paused.
+	 */
+	public static boolean isPaused() {
+		return (trackExists() && pauseTime > 0f);
+	}
+
 	/**
 	 * Pauses the current track.
 	 */
 	public static void pause() {
-		if (isPlaying())
+		if (isPlaying()) {
+			pauseTime = player.getPosition();
 			player.pause();
+		}
 	}
 
 	/**
@@ -218,6 +233,7 @@ public class MusicController {
 	 */
 	public static void resume() {
 		if (trackExists()) {
+			pauseTime = 0f;
 			player.resume();
 			player.setVolume(1.0f);
 		}
@@ -241,11 +257,13 @@ public class MusicController {
 
 	/**
 	 * Returns the position in the current track, in ms.
-	 * If no track is playing, 0 will be returned.
+	 * If no track is loaded, 0 will be returned.
 	 */
 	public static int getPosition() {
 		if (isPlaying())
 			return Math.max((int) (player.getPosition() * 1000 + Options.getMusicOffset()), 0);
+		else if (isPaused())
+			return Math.max((int) (pauseTime * 1000 + Options.getMusicOffset()), 0);
 		else
 			return 0;
 	}