X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsink%2FIcecast2Sink.java;h=f13fef1c09a2f3e803e7b455ff4f5eadbe3d1e03;hb=6eb367d5696f1cb793af06509cabc4254a6141db;hp=5487cc48fb5b34784f706dbd50ef4939122f2b76;hpb=f554e51504f7e39e658a84d79c041e0b0d8a6393;p=sonitus.git

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 5487cc4..f13fef1 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
@@ -23,21 +23,18 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.Socket;
 import java.net.URLEncoder;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sonitus.data.AbstractFilter;
 import net.pterodactylus.sonitus.data.Controller;
+import net.pterodactylus.sonitus.data.DataPacket;
+import net.pterodactylus.sonitus.data.Filter;
 import net.pterodactylus.sonitus.data.Metadata;
-import net.pterodactylus.sonitus.data.Sink;
 import net.pterodactylus.sonitus.io.InputStreamDrainer;
 
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.collect.FluentIterable;
 import com.google.common.io.BaseEncoding;
 import com.google.common.io.Closeables;
 
@@ -47,7 +44,7 @@ import com.google.common.io.Closeables;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Icecast2Sink implements Sink {
+public class Icecast2Sink extends AbstractFilter {
 
 	/** The logger. */
 	private static final Logger logger = Logger.getLogger(Icecast2Sink.class.getName());
@@ -76,11 +73,9 @@ public class Icecast2Sink implements Sink {
 	/** Whether to publish the server. */
 	private final boolean publishServer;
 
+	/** The output stream to the server. */
 	private OutputStream socketOutputStream;
 
-	/** The current metadata. */
-	private Metadata metadata;
-
 	/**
 	 * Creates a new Icecast2 sink.
 	 *
@@ -103,6 +98,7 @@ public class Icecast2Sink implements Sink {
 	 * 		not publish it
 	 */
 	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;
@@ -114,28 +110,14 @@ public class Icecast2Sink 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));
@@ -170,18 +152,12 @@ public class Icecast2Sink implements Sink {
 
 	@Override
 	public void metadataUpdated(final Metadata metadata) {
-		this.metadata = metadata;
+		super.metadataUpdated(metadata);
 		new Thread(new Runnable() {
 
 			@Override
 			public void run() {
-				String metadataString = String.format("%s (%s)", Joiner.on(" - ").skipNulls().join(FluentIterable.from(Arrays.asList(metadata.artist(), metadata.name())).transform(new Function<Optional<String>, Object>() {
-
-					@Override
-					public Object apply(Optional<String> input) {
-						return input.orNull();
-					}
-				})), "Sonitus");
+				String metadataString = String.format("%s (%s)", metadata.title(), "Sonitus");
 				logger.info(String.format("Updating metadata to %s", metadataString));
 
 				Socket socket = null;
@@ -214,8 +190,8 @@ public class Icecast2Sink implements Sink {
 	}
 
 	@Override
-	public void process(byte[] buffer) throws IOException {
-		socketOutputStream.write(buffer);
+	public void process(DataPacket dataPacket) throws IOException {
+		socketOutputStream.write(dataPacket.buffer());
 		socketOutputStream.flush();
 	}