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=87d94969a35114a2ecfc990bb467a948838bd75a;hpb=3aca6eb7580456837944877d798f207c4a82e964;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 87d9496..f13fef1 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
@@ -28,13 +28,13 @@ 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.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;
@@ -44,14 +44,11 @@ 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());
- /** The event bus. */
- private final EventBus eventBus;
-
/** The server name. */
private final String server;
@@ -79,14 +76,9 @@ public class Icecast2Sink implements Sink {
/** The output stream to the server. */
private OutputStream socketOutputStream;
- /** The current metadata. */
- private Metadata metadata;
-
/**
* Creates a new Icecast2 sink.
*
- * @param eventBus
- * The event bus
* @param server
* The hostname of the server
* @param port
@@ -105,8 +97,8 @@ public class Icecast2Sink 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;
@@ -118,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> controllers() {
return Collections.emptyList();
}
- //
- // SINK METHODS
- //
-
@Override
public void open(Metadata metadata) throws IOException {
logger.info(String.format("Connecting to %s:%d...", server, port));
@@ -174,7 +152,7 @@ public class Icecast2Sink implements Sink {
@Override
public void metadataUpdated(final Metadata metadata) {
- this.metadata = metadata;
+ super.metadataUpdated(metadata);
new Thread(new Runnable() {
@Override
@@ -209,12 +187,11 @@ public class Icecast2Sink implements Sink {
}
}
}).start();
- eventBus.post(new MetadataUpdated(this, metadata));
}
@Override
- public void process(byte[] buffer) throws IOException {
- socketOutputStream.write(buffer);
+ public void process(DataPacket dataPacket) throws IOException {
+ socketOutputStream.write(dataPacket.buffer());
socketOutputStream.flush();
}