From f93509287167684b5b6d9311a9d3c0e4a82b16f0 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sat, 7 Apr 2018 19:20:35 -0400
Subject: [PATCH] v0.6.4a: music is now prepared synchronously

---
 .../java/com/watabou/noosa/audio/Music.java   | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/SPD-classes/src/main/java/com/watabou/noosa/audio/Music.java b/SPD-classes/src/main/java/com/watabou/noosa/audio/Music.java
index 9025c2075..8fceea7fa 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/audio/Music.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/audio/Music.java
@@ -31,7 +31,7 @@ import android.telephony.TelephonyManager;
 
 import com.watabou.noosa.Game;
 
-public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener {
+public enum Music {
 	
 	INSTANCE;
 	
@@ -65,10 +65,11 @@ public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnError
 			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();
-			afd.close();
+			mp.prepare();
+			player = mp;
+			player.start();
+			player.setLooping(looping);
+			player.setVolume(volume, volume);
 			
 		} catch (Exception e) {
 			
@@ -82,21 +83,6 @@ public enum Music implements MediaPlayer.OnPreparedListener, MediaPlayer.OnError
 		lastPlayed = null;
 		stop();
 	}
-
-	@Override
-	public void onPrepared( MediaPlayer mp ) {
-		player = mp;
-		player.start();
-		player.setLooping(looping);
-		player.setVolume(volume, volume);
-	}
-	
-	@Override
-	public boolean onError( MediaPlayer mp, int what, int extra ) {
-		mp.release();
-		player = null;
-		return true;
-	}
 	
 	public void pause() {
 		if (player != null) {