X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsink%2FIcecast2Sink.java;h=f98fba54c7d087f42b7fbe9bbd137dcbbfc68d02;hb=633a841142f978235ed9f745b6ba16c278963e62;hp=89a930c36c2a25416808f98da8289ca27797cd68;hpb=f761d816f6e2f14bc80efb45e4cb5c130fa9a57f;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 89a930c..f98fba5 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,16 @@ 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.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 +42,7 @@ import com.google.common.io.Closeables;
*
* @author David âBombeâ Roden
*/
-public class Icecast2Sink implements Sink {
+public class Icecast2Sink extends AbstractFilter {
/** The logger. */
private static final Logger logger = Logger.getLogger(Icecast2Sink.class.getName());
@@ -76,11 +71,14 @@ public class Icecast2Sink implements Sink {
/** Whether to publish the server. */
private final boolean publishServer;
+ /** The output stream to the server. */
private OutputStream socketOutputStream;
/**
* Creates a new Icecast2 sink.
*
+ * @param eventBus
+ * The event bus
* @param server
* The hostname of the server
* @param port
@@ -100,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;
@@ -111,7 +110,7 @@ public class Icecast2Sink implements Sink {
}
//
- // CONTROLLED METHODS
+ // FILTER METHODS
//
@Override
@@ -119,10 +118,6 @@ public class Icecast2Sink implements Sink {
return Collections.emptyList();
}
- //
- // SINK METHODS
- //
-
@Override
public void open(Metadata metadata) throws IOException {
logger.info(String.format("Connecting to %s:%d...", server, port));
@@ -157,17 +152,12 @@ public class Icecast2Sink implements Sink {
@Override
public void metadataUpdated(final 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, Object>() {
-
- @Override
- public Object apply(Optional 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;