Fixes loading mp3 multiclip since AudioInputStream.availble didn't work.

src/itdelatrisu/opsu/audio/HitSound.java

@@ -20,8 +20,6 @@ package itdelatrisu.opsu.audio;
 
 import java.util.HashMap;
 
-import javax.sound.sampled.Clip;
-
 /**
  * Hit sounds.
  */

src/itdelatrisu/opsu/audio/MultiClip.java

@@ -1,7 +1,5 @@
 package itdelatrisu.opsu.audio;
 
-import itdelatrisu.opsu.ErrorHandler;
-
 import java.io.IOException;
 import java.util.LinkedList;
 
@@ -21,28 +19,49 @@ public class MultiClip {
 	AudioFormat format;
 	
 	/** The data for this audio sample */
-	byte[] buffer;
+	byte[] audioData;
 	
 	/** The name given to this clip */
 	String name;
 	
-	/** Constructor 
+	/** Size of a single buffer */
-	 * @param name 
+	final int BUFFER_SIZE = 0x1000;
-	 * @throws LineUnavailableException */
+	
+	/** Constructor  */
 	public MultiClip(String name, AudioInputStream audioIn) throws IOException, LineUnavailableException {
 		this.name = name;
 		if(audioIn != null){
-			buffer = new byte[audioIn.available()];
+			format = audioIn.getFormat();
+			
+			LinkedList<byte[]> allBufs = new LinkedList<byte[]>();
+			
 			int readed = 0;
-			while(readed < buffer.length) {
+			boolean hasData = true;
-				int read = audioIn.read(buffer, readed, buffer.length-readed);
+			while (hasData) {
-				if(read < 0 )
+				readed = 0;
+				byte[] tbuf = new byte[BUFFER_SIZE];
+				while (readed < tbuf.length) {
+					int read = audioIn.read(tbuf, readed, tbuf.length - readed);
+					if (read < 0) {
+						hasData = false;
 						break;
+					}
 					readed += read;
 				}
-			format = audioIn.getFormat();
+				allBufs.add(tbuf);
-		} else {
+			}
-			System.out.println("Null multiclip");
+			
+			audioData = new byte[(allBufs.size() - 1) * BUFFER_SIZE + readed];
+			
+			int cnt = 0;
+			for (byte[] tbuf : allBufs) {
+				int size = BUFFER_SIZE;
+				if (cnt == allBufs.size() - 1) {
+					size = readed;
+				}
+				System.arraycopy(tbuf, 0, audioData, BUFFER_SIZE * cnt, size);
+				cnt++;
+			}
 		}
 		getClip();
 	}
@@ -88,7 +107,7 @@ public class MultiClip {
 		}
 		Clip t = AudioSystem.getClip();
 		if (format != null)
-			t.open(format, buffer, 0, buffer.length);
+			t.open(format, audioData, 0, audioData.length);
 		clips.add(t);
 		return t;
 	}

src/itdelatrisu/opsu/audio/SoundEffect.java

@@ -18,8 +18,6 @@
 
 package itdelatrisu.opsu.audio;
 
-import javax.sound.sampled.Clip;
-
 /**
  * Sound effects.
  */