Pull all interfaces into a single interface: Filter.

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

diff --git a/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java b/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
index 515aece..f98fba5 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
@@ -28,14 +28,11 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.sonitus.data.AbstractControlledComponent;
+import net.pterodactylus.sonitus.data.AbstractFilter;
 import net.pterodactylus.sonitus.data.Controller;
 import net.pterodactylus.sonitus.data.Metadata;
-import net.pterodactylus.sonitus.data.Sink;
-import net.pterodactylus.sonitus.data.event.MetadataUpdated;
 import net.pterodactylus.sonitus.io.InputStreamDrainer;
 
-import com.google.common.eventbus.EventBus;
 import com.google.common.io.BaseEncoding;
 import com.google.common.io.Closeables;
 
@@ -45,14 +42,11 @@ import com.google.common.io.Closeables;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Icecast2Sink extends AbstractControlledComponent implements Sink {
+public class Icecast2Sink extends AbstractFilter {
 
        /** The logger. */
        private static final Logger logger = Logger.getLogger(Icecast2Sink.class.getName());
 
-       /** The event bus. */
-       private final EventBus eventBus;
-
        /** The server name. */
        private final String server;
 
@@ -80,9 +74,6 @@ public class Icecast2Sink extends AbstractControlledComponent implements Sink {
        /** The output stream to the server. */
        private OutputStream socketOutputStream;
 
-       /** The current metadata. */
-       private Metadata metadata;
-
        /**
         * Creates a new Icecast2 sink.
         *
@@ -106,8 +97,8 @@ public class Icecast2Sink extends AbstractControlledComponent implements Sink {
         *              {@code true} to publish the server in a public directory, {@code false} to
         *              not publish it
         */
-       public Icecast2Sink(EventBus eventBus, String server, int port, String password, String mountPoint, String serverName, String serverDescription, String genre, boolean publishServer) {
-               this.eventBus = eventBus;
+       public Icecast2Sink(String server, int port, String password, String mountPoint, String serverName, String serverDescription, String genre, boolean publishServer) {
+               super(String.format("icecast://%s:%d/%s", server, port, mountPoint));
                this.server = server;
                this.port = port;
                this.password = password;
@@ -119,28 +110,14 @@ public class Icecast2Sink extends AbstractControlledComponent implements Sink {
        }
 
        //
-       // CONTROLLED METHODS
+       // FILTER METHODS
        //
 
        @Override
-       public String name() {
-               return String.format("icecast://%s:%d/%s", server, port, mountPoint);
-       }
-
-       @Override
-       public Metadata metadata() {
-               return metadata;
-       }
-
-       @Override
        public List<Controller<?>> controllers() {
                return Collections.emptyList();
        }
 
-       //
-       // SINK METHODS
-       //
-
        @Override
        public void open(Metadata metadata) throws IOException {
                logger.info(String.format("Connecting to %s:%d...", server, port));
@@ -175,7 +152,7 @@ public class Icecast2Sink extends AbstractControlledComponent implements Sink {
 
        @Override
        public void metadataUpdated(final Metadata metadata) {
-               this.metadata = metadata;
+               super.metadataUpdated(metadata);
                new Thread(new Runnable() {
 
                        @Override
@@ -210,8 +187,6 @@ public class Icecast2Sink extends AbstractControlledComponent implements Sink {
                                }
                        }
                }).start();
-               fireMetadataUpdated(metadata);
-               eventBus.post(new MetadataUpdated(this, metadata));
        }
 
        @Override