X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsink%2FAudioSink.java;h=7c28f2c620544c3fd802fe2683726dbd1a435c31;hb=87436ac0b103a112722c1df835e11ec928e57d38;hp=b0f00678c8866e36e68f1f9b5fbc1f5e3d19e991;hpb=d07ec839a266057079d5a065176d46a0cc567b5d;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java b/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
index b0f0067..7c28f2c 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sonitus.data.sink;
 
+import static javax.sound.sampled.BooleanControl.Type.MUTE;
 import static javax.sound.sampled.FloatControl.Type.VOLUME;
 
 import java.io.IOException;
@@ -26,10 +27,14 @@ import java.util.List;
 import java.util.logging.Logger;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.BooleanControl;
+import javax.sound.sampled.Control;
+import javax.sound.sampled.DataLine;
 import javax.sound.sampled.FloatControl;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.SourceDataLine;
 
+import net.pterodactylus.sonitus.data.AbstractControlledComponent;
 import net.pterodactylus.sonitus.data.Controller;
 import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.data.Sink;
@@ -48,7 +53,7 @@ import com.google.common.eventbus.EventBus;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class AudioSink implements Sink {
+public class AudioSink extends AbstractControlledComponent implements Sink {
 
 	/** The logger. */
 	private static final Logger logger = Logger.getLogger(AudioSink.class.getName());
@@ -100,28 +105,45 @@ public class AudioSink implements Sink {
 
 			@Override
 			protected void valueSet(Double value) {
-				if (sourceDataLine != null) {
-					FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME);
-					volumeControl.setValue((float) (value * volumeControl.getMaximum()));
+				/* search for preferred volume control. */
+				FloatControl volumeControl = getVolumeControl(sourceDataLine);
+				if (volumeControl == null) {
+					/* could not find volume control! */
+					return;
 				}
+
+				volumeControl.setValue((float) (value * volumeControl.getMaximum()));
 			}
 		};
 		muteSwitch = new Switch("Mute") {
 
+			/** The previous value in case we have to emulate the mute control. */
 			private float previousValue;
 
 			@Override
 			protected void valueSet(Boolean value) {
-				if (sourceDataLine != null) {
-					FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME);
-					if (value) {
-						previousValue = volumeControl.getValue();
-						volumeControl.setValue(0);
-					} else {
-						volumeControl.setValue(previousValue);
-					}
+				/* search for mute control. */
+				BooleanControl muteControl = getMuteControl(sourceDataLine);
+				if (muteControl != null) {
+					muteControl.setValue(value);
+					return;
+				}
+
+				/* could not find mute control, use volume control! */
+				FloatControl volumeControl = getVolumeControl(sourceDataLine);
+				if (volumeControl == null) {
+					/* no volume control, either? */
+					return;
+				}
+
+				if (value) {
+					previousValue = volumeControl.getValue();
+					volumeControl.setValue(0);
+				} else {
+					volumeControl.setValue(previousValue);
 				}
 			}
+
 		};
 	}
 
@@ -159,6 +181,7 @@ public class AudioSink implements Sink {
 			metadataUpdated(metadata);
 		} catch (LineUnavailableException e) {
 			/* TODO */
+			sourceDataLine = null;
 			throw new IOException(e);
 		}
 	}
@@ -173,6 +196,7 @@ public class AudioSink implements Sink {
 	public void metadataUpdated(Metadata metadata) {
 		logger.info(String.format("Now playing %s.", metadata));
 		this.metadata = metadata;
+		fireMetadataUpdated(metadata);
 		eventBus.post(new MetadataUpdated(this, metadata));
 	}
 
@@ -182,4 +206,57 @@ public class AudioSink implements Sink {
 		logger.finest(String.format("AudioSink: Wrote %d Bytes.", buffer.length));
 	}
 
+	//
+	// PRIVATE METHODS
+	//
+
+	/**
+	 * Returns the {@link FloatControl.Type.VOLUME} control.
+	 *
+	 * @param dataLine
+	 * 		The data line to search for the control
+	 * @return The control, or {@code null} if no volume control could be found
+	 */
+	private static FloatControl getVolumeControl(DataLine dataLine) {
+		return getControl(dataLine, VOLUME, FloatControl.class);
+	}
+
+	/**
+	 * Returns the {@link BooleanControl.Type.MUTE} control.
+	 *
+	 * @param dataLine
+	 * 		The data line to search for the control
+	 * @return The control, or {@code null} if no mute control could be found
+	 */
+	private static BooleanControl getMuteControl(DataLine dataLine) {
+		return getControl(dataLine, MUTE, BooleanControl.class);
+	}
+
+	/**
+	 * Searches the given data line for a control of the given type and returns it.
+	 * If the given data line is {@code null}, {@code null} is returned.
+	 *
+	 * @param dataLine
+	 * 		The data line to search for a control
+	 * @param controlType
+	 * 		The type of the control to search
+	 * @param controlClass
+	 * 		The class of the control
+	 * @param <T>
+	 * 		The class of the control
+	 * @return The control, or {@code null} if no control could be found
+	 */
+	private static <T> T getControl(DataLine dataLine, Control.Type controlType, Class<T> controlClass) {
+		if (dataLine == null) {
+			return null;
+		}
+		Control[] controls = dataLine.getControls();
+		for (Control control : controls) {
+			if (control.getType().equals(controlType)) {
+				return (T) control;
+			}
+		}
+		return null;
+	}
+
 }