Fix javadoc.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / sink / AudioSink.java

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 066588d..07499ad 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
@@ -34,17 +34,16 @@ 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;
 import net.pterodactylus.sonitus.data.Source;
 import net.pterodactylus.sonitus.data.controller.Fader;
 import net.pterodactylus.sonitus.data.controller.Switch;
-import net.pterodactylus.sonitus.data.event.MetadataUpdated;
 import net.pterodactylus.sonitus.io.IntegralWriteOutputStream;
 
 import com.google.common.base.Preconditions;
-import com.google.common.eventbus.EventBus;
 
 /**
  * {@link Sink} implementation that uses the JDK’s {@link AudioSystem} to play
@@ -52,23 +51,17 @@ 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());
 
-       /** The event bus. */
-       private final EventBus eventBus;
-
        /** The volume fader. */
        private final Fader volumeFader;
 
        /** The “mute” switch. */
        private final Switch muteSwitch;
 
-       /** The current metadata. */
-       private Metadata metadata;
-
        /** The audio output. */
        private SourceDataLine sourceDataLine;
 
@@ -92,14 +85,9 @@ public class AudioSink implements Sink {
                }
        }, 1024);
 
-       /**
-        * Creates a new audio sink.
-        *
-        * @param eventBus
-        *              The event bus
-        */
-       public AudioSink(EventBus eventBus) {
-               this.eventBus = eventBus;
+       /** Creates a new audio sink. */
+       public AudioSink() {
+               super("Audio Output");
                volumeFader = new Fader("Volume") {
 
                        @Override
@@ -151,16 +139,6 @@ public class AudioSink implements Sink {
        //
 
        @Override
-       public String name() {
-               return "Audio Output";
-       }
-
-       @Override
-       public Metadata metadata() {
-               return metadata;
-       }
-
-       @Override
        public List<Controller<?>> controllers() {
                return Arrays.<Controller<?>>asList(volumeFader, muteSwitch);
        }
@@ -193,9 +171,8 @@ public class AudioSink implements Sink {
 
        @Override
        public void metadataUpdated(Metadata metadata) {
-               logger.info(String.format("Now playing %s.", metadata));
-               this.metadata = metadata;
-               eventBus.post(new MetadataUpdated(this, metadata));
+               super.metadataUpdated(metadata);
+               logger.fine(String.format("Now playing %s.", metadata));
        }
 
        @Override
@@ -209,7 +186,7 @@ public class AudioSink implements Sink {
        //
 
        /**
-        * Returns the {@link FloatControl.Type.VOLUME} control.
+        * Returns the {@link FloatControl.Type#VOLUME} control.
         *
         * @param dataLine
         *              The data line to search for the control
@@ -220,7 +197,7 @@ public class AudioSink implements Sink {
        }
 
        /**
-        * Returns the {@link BooleanControl.Type.MUTE} control.
+        * Returns the {@link BooleanControl.Type#MUTE} control.
         *
         * @param dataLine
         *              The data line to search for the control