18.03.2018

Signed-off-by: Ralph Niemitz <ralph.niemitz@gmx.de>

Author: RalleYTN

README.md

@@ -1,4 +1,5 @@
 [![Build Result](https://travis-ci.org/RalleYTN/SimpleAudio.svg?branch=master)](https://travis-ci.org/RalleYTN/SimpleAudio)
+[![Coverage Status](https://coveralls.io/repos/github/RalleYTN/SimpleAudio/badge.svg?branch=master)](https://coveralls.io/github/RalleYTN/SimpleAudio?branch=master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/87a04f7e6823474a83b49daf6acc6e23)](https://www.codacy.com/app/ralph.niemitz/SimpleAudio?utm_source=github.com&utm_medium=referral&utm_content=RalleYTN/SimpleAudio&utm_campaign=Badge_Grade)
 
 # Description
@@ -19,6 +20,8 @@ Code written with it, is highly readable and maintainable.
 - Moved everything static in the `Audio` interface to `AbstractAudio`
 - Fixed a bug that caused `BufferedAudio.isPlaying()` to return a wrong value
 - Fixed a bug that would re-open an instance of `StreamedAudio` if it was closed in the `REACHED_END` event
+- Added a close method in the `Playlist` class
+- Fixed most threading issues in `StreamedAudio`
 
 ### Version 2.0.0 (incompatible with older versions of this library)
 

3rd-party-licenses/jl1.0.1_LICENSE.txt libs/jars/javazoom.spi/1.9.5/LICENSE

@@ -21,7 +21,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package de.ralleytn.simple.audio;
 
 import java.io.File;
@@ -66,18 +65,22 @@
  */
 public abstract class AbstractAudio implements Audio {
 
+	// ==== 18.03.2018 | Ralph Niemitz/RalleYTN(ralph.niemitz@gmx.de)
+	// Made the trigger methods synchronized to prevent concurrent access on the listeners
+	// ====
+	
 	/**
 	 * @since 1.0.0
 	 */
 	public static final int LOOP_ENDLESS = -1;
 
-	protected volatile URL resource;
-	protected volatile FileFormat fileFormat;
-	protected volatile AudioInputStream audioInputStream;
-	protected volatile HashMap<String, Control> controls;
-	protected volatile boolean open;
-	protected volatile boolean paused;
-	protected volatile List<AudioListener> listeners = new ArrayList<>();
+	protected URL resource;
+	protected FileFormat fileFormat;
+	protected AudioInputStream audioInputStream;
+	protected HashMap<String, Control> controls;
+	protected boolean open;
+	protected boolean paused;
+	protected List<AudioListener> listeners = new ArrayList<>();
 
 	/**
 	 * @param file name of the resource file
@@ -267,6 +270,11 @@ public AbstractAudio(URI uri) throws AudioException {
 	 */
 	public static Mixer.Info[] getPorts() {
 
+		// FIXME
+		// ==== 17.03.2018 | Ralph Niemitz/RalleYTN(ralph.niemitz@gmx.de)
+		// AudioSystem.getMixerInfo cuts some of the names for no good reason
+		// ====
+		
 		return AudioSystem.getMixerInfo();
 	}
 
@@ -562,7 +570,7 @@ public boolean isPaused() {
 	 * @param type the event type
 	 * @since 1.1.0
 	 */
-	protected void trigger(AudioEvent.Type type) {
+	protected synchronized void trigger(AudioEvent.Type type) {
 
 		AudioEvent event = new AudioEvent(this, type);
 		this.listeners.forEach(listener -> listener.update(event));
@@ -575,7 +583,7 @@ protected void trigger(AudioEvent.Type type) {
 	 * @param newVal the new value
 	 * @since 1.1.0
 	 */
-	protected void trigger(AudioEvent.Type type, Object oldVal, Object newVal) {
+	protected synchronized void trigger(AudioEvent.Type type, Object oldVal, Object newVal) {
 
 		AudioEvent event = new AudioEvent(this, type, oldVal, newVal);
 		this.listeners.forEach(listener -> listener.update(event));
@@ -628,7 +636,8 @@ private static final URL extractZipEntry(ZipFile zip, String entry) throws IOExc
 		File tempDir = new File(System.getProperty("java.io.tmpdir"));
 		File extracted = new File(tempDir, "simple-audio_buffered-" + System.nanoTime() + extension);
 
-		try(InputStream input = zip.getInputStream(zipEntry); FileOutputStream output = new FileOutputStream(extracted)) {
+		try(InputStream input = zip.getInputStream(zipEntry);
+			FileOutputStream output = new FileOutputStream(extracted)) {
 
 			int readBytes = 0;
 

3rd-party-licenses/mp3spi1.9.5_LICENSE.txt libs/jars/javazoom/1.0.1/LICENSE

@@ -244,22 +244,30 @@ public void open() throws AudioException {
 	@Override
 	public void close() {
 
-		if(this.isPlaying()) {
-			
-			this.stop();
-		}
-		
-		this.clip.flush();
-		this.clip.close();
-		this.controls.clear();
+		// ==== 18.03.2018 | Ralph Niemitz/RalleYTN(ralph.niemitz@gmx.de)
+		// Fixed a NullPointerException that was thrown if this method is called without #open being called first.
+		// ====
 
-		try {
+		if(this.open) {
 
-			this.audioInputStream.close();
+			if(this.isPlaying()) {
+				
+				this.stop();
+			}
+			
+			this.clip.flush();
+			this.clip.close();
+			this.controls.clear();
+			
+			try {
+				
+				this.audioInputStream.close();
+				
+			} catch(IOException exception) {}
 
-		} catch(IOException exception) {}
+			this.open = false;
+		}
 
-		this.open = false;
 		this.trigger(AudioEvent.Type.CLOSED);
 	}
 

3rd-party-licenses/tritonus_share_LICENSE.txt libs/jars/org.tritonus.share/0.3.6/LICENSE

@@ -317,6 +317,15 @@ public float getVolume() {
 		return this.volume;
 	}
 
+	/**
+	 * Calls the {@link Audio#close()} method for all tracks in this playlist.
+	 * @since 2.0.0
+	 */
+	public void close() {
+		
+		this.tracks.forEach(Audio::close);
+	}
+	
 	/**
 	 * Starts the next track.
 	 * @since 1.1.0

src/main/java/de/ralleytn/simple/audio/AbstractAudio.java

@@ -21,7 +21,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package de.ralleytn.simple.audio;
 
 /**