konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.4.0: fixed music not properly pausing if tracks are switched

Browse Source
This commit is contained in:
Evan Debenham
2024-02-25 13:18:29 -05:00
parent aa507c7efc
commit 19ac7e7a45
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SPD-classes/src/main/java/com/watabou/noosa/audio/Music.java
View File

@@ -150,7 +150,7 @@ public enum Music {
} }
public synchronized void update(){ public synchronized void update(){
if (fadeTotal > 0f){ if (fadeTotal > 0f && !paused){
fadeTime += Game.elapsed; fadeTime += Game.elapsed;
if (player != null) { if (player != null) {
@@ -217,7 +217,7 @@ public enum Music {
player = Gdx.audio.newMusic(Gdx.files.internal(track)); player = Gdx.audio.newMusic(Gdx.files.internal(track));
player.setLooping(looping); player.setLooping(looping);
player.setVolume(volumeWithFade()); player.setVolume(volumeWithFade());
player.play(); if (!paused) player.play();
if (listener != null) { if (listener != null) {
player.setOnCompletionListener(listener); player.setOnCompletionListener(listener);
} }
@@ -232,14 +232,18 @@ public enum Music {
trackList = null; trackList = null;
stop(); stop();
} }
private boolean paused = false;
public synchronized void pause() { public synchronized void pause() {
paused = true;
if (player != null) { if (player != null) {
player.pause(); player.pause();
} }
} }
public synchronized void resume() { public synchronized void resume() {
paused = false;
if (player != null) { if (player != null) {
player.play(); player.play();
player.setLooping(looping); player.setLooping(looping);