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

v0.6.2c: improved how the game handles music volume and asset handling

Browse Source
This commit is contained in:
Evan Debenham
2017-11-12 23:01:44 -05:00
committed by Evan Debenham
parent 759ff2fb9d
commit 31042228ff
8 changed files with 7 additions and 15 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

@@ -29,8 +29,6 @@ import android.telephony.TelephonyManager;
import com.watabou.noosa.Game;
import java.io.IOException;
public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener {
INSTANCE;
@@ -41,6 +39,7 @@ public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnError
private boolean looping;
private boolean enabled = true;
private float volume = 1f;
public void play( String assetName, boolean looping ) {
@@ -67,8 +66,9 @@ public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnError
mp.setOnPreparedListener( this );
mp.setOnErrorListener( this );
mp.prepareAsync();
afd.close();
} catch (IOException e) {
} catch (Exception e) {
player = null;
@@ -85,6 +85,7 @@ public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnError
player = mp;
player.start();
player.setLooping(looping);
player.setVolume(volume, volume);
}
@Override
@@ -116,6 +117,7 @@ public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnError
}
public void volume( float value ) {
volume = value;
if (player != null) {
player.setVolume( value, value );
}