LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.6.2a: fixed errors where music would be called without being prepared

Browse Source
This commit is contained in:
Evan Debenham 2017-11-01 01:45:42 -04:00
parent 25e840b427
commit 0ce6f14a73
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,16 +61,15 @@ public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnError
AssetFileDescriptor afd = Game.instance.getAssets().openFd( assetName );
player = new MediaPlayer();
player.setAudioStreamType( AudioManager.STREAM_MUSIC );
player.setDataSource( afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength() );
player.setOnPreparedListener( this );
player.setOnErrorListener( this );
player.prepareAsync();
MediaPlayer mp = new MediaPlayer();
mp.setAudioStreamType( AudioManager.STREAM_MUSIC );
mp.setDataSource( afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength() );
mp.setOnPreparedListener( this );
mp.setOnErrorListener( this );
mp.prepareAsync();
} catch (IOException e) {
player.release();
player = null;
}
@ -82,17 +81,16 @@ public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnError
}
@Override
public void onPrepared( MediaPlayer player ) {
public void onPrepared( MediaPlayer mp ) {
player = mp;
player.start();
player.setLooping(looping);
}
@Override
public boolean onError( MediaPlayer mp, int what, int extra ) {
if (player != null) {
player.release();
player = null;
}
mp.release();
player = null;
return true;
}