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

Follow-up to a6ece30: allow changing volume anywhere with ALT key.

Browse Source 
The master volume can now be changed (using the mouse wheel) with the ALT key pressed in any menu, as in osu!.

Also improved the handling of dimmed tracks.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-03-26 20:45:33 -04:00
parent 18e57fdb96
commit c15cd5cb4c
8 changed files with 88 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,9 @@ public class MusicController {
/** Whether the current track volume is dimmed. */
private static boolean trackDimmed = false;
/** The track dim level, if dimmed. */
private static float dimLevel = 1f;
// This class should not be instantiated.
private MusicController() {}
@@ -291,7 +294,7 @@ public class MusicController {
* @param volume [0, 1]
*/
public static void setVolume(float volume) {
SoundStore.get().setMusicVolume(volume);
SoundStore.get().setMusicVolume((isTrackDimmed()) ? volume * dimLevel : volume);
}
/**
@@ -336,8 +339,9 @@ public class MusicController {
*/
public static void toggleTrackDimmed(float multiplier) {
float volume = Options.getMusicVolume() * Options.getMasterVolume();
setVolume((trackDimmed) ? volume : volume * multiplier);
dimLevel = (isTrackDimmed()) ? 1f : multiplier;
trackDimmed = !trackDimmed;
setVolume(volume);
}
/**