fixing errors

core/src/zero1hd/polyjet/audio/AudioAnalyzer.java

@@ -1,12 +1,11 @@
 package zero1hd.polyjet.audio;
 
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.FloatArray;
 
 import edu.emory.mathcs.jtransforms.fft.FloatFFT_1D;
 import zero1hd.polyjet.util.MiniEvents;
-import zero1hd.polyjet.util.MiniListener;
+import zero1hd.polyjet.util.MiniSender;
 
 public class AudioAnalyzer {
 	private boolean containsData;
@@ -45,11 +44,12 @@ public class AudioAnalyzer {
 	int UMThresholdCalcRange;
 	int bassThresholdCalcRange;
 	
-	private Array<MiniListener> listeners;
+	public MiniSender sender;
 	
 	private volatile int progress;
 	public AudioAnalyzer() {
-		listeners = new Array<>();
+		sender = new MiniSender();
+		
 		
 		analysisAlgorithm = new Runnable() {
 
@@ -113,7 +113,7 @@ public class AudioAnalyzer {
 				shrinkData();
 				containsData = true;
 				
-				send(MiniEvents.SPECTRAL_FLUX_DONE);
+				sender.send(MiniEvents.SPECTRAL_FLUX_DONE);
 			}
 		};
 		
@@ -196,6 +196,8 @@ public class AudioAnalyzer {
 				Gdx.app.debug("Audio Analyzer", "overlapped beats checked.");
 				
 				finalized = true;
+				
+				sender.send(MiniEvents.MUSIC_DATA_CLEANED);
 			}
 		};
 		
@@ -304,14 +306,4 @@ public class AudioAnalyzer {
 	public boolean isFinalized() {
 		return finalized;
 	}
-	
-	public void addListener(MiniListener listener) {
-		listeners.add(listener);
-	}
-	
-	public void send(MiniEvents ID) {
-		while (listeners.iterator().hasNext()) {
-			listeners.iterator().next().handle(ID);
-		}
-	}
 }

core/src/zero1hd/polyjet/audio/WavAudioData.java

@@ -8,10 +8,11 @@ import javax.sound.sampled.AudioFormat;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.utils.Disposable;
 
 import zero1hd.wavedecoder.WavDecoder;
 
-public class WavAudioData implements AudioData {
+public class WavAudioData implements AudioData, Disposable {
 	private int readWindowSize = 1024;
 	private AudioFormat format;
 	int readIndex;
@@ -46,8 +47,6 @@ public class WavAudioData implements AudioData {
 	public void reset() {
 		if (playbackMusic != null) {
 			playbackMusic.stop();
-			playbackMusic.dispose();
-			playbackMusic = null;
 		}
 	}
 	
@@ -75,4 +74,9 @@ public class WavAudioData implements AudioData {
 	public int getSampleCount() {
 		return decoder.getDataSize()/(2*decoder.getChannels());
 	}
+
+	@Override
+	public void dispose() {
+		playbackMusic.dispose();
+	}
 }