projects
/
sonitus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
0a5d22d
..
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
@@
-23,18
+23,16
@@
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.Socket;
import java.net.URLEncoder;
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 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.Metadata;
-import net.pterodactylus.sonitus.data.Sink;
import net.pterodactylus.sonitus.io.InputStreamDrainer;
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;
import com.google.common.io.BaseEncoding;
import com.google.common.io.Closeables;
@@
-44,7
+42,7
@@
import com.google.common.io.Closeables;
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
*
* @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());
/** The logger. */
private static final Logger logger = Logger.getLogger(Icecast2Sink.class.getName());
@@
-73,11
+71,14
@@
public class Icecast2Sink implements Sink {
/** Whether to publish the server. */
private final boolean publishServer;
/** Whether to publish the server. */
private final boolean publishServer;
+ /** The output stream to the server. */
private OutputStream socketOutputStream;
/**
* Creates a new Icecast2 sink.
*
private OutputStream socketOutputStream;
/**
* Creates a new Icecast2 sink.
*
+ * @param eventBus
+ * The event bus
* @param server
* The hostname of the server
* @param port
* @param server
* The hostname of the server
* @param port
@@
-97,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) {
* 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;
this.server = server;
this.port = port;
this.password = password;
@@
-108,10
+110,15
@@
public class Icecast2Sink implements Sink {
}
//
}
//
- //
SINK
METHODS
+ //
FILTER
METHODS
//
@Override
//
@Override
+ public List<Controller<?>> controllers() {
+ return Collections.emptyList();
+ }
+
+ @Override
public void open(Metadata metadata) throws IOException {
logger.info(String.format("Connecting to %s:%d...", server, port));
Socket socket = new Socket(server, port);
public void open(Metadata metadata) throws IOException {
logger.info(String.format("Connecting to %s:%d...", server, port));
Socket socket = new Socket(server, port);
@@
-145,17
+152,12
@@
public class Icecast2Sink implements Sink {
@Override
public void metadataUpdated(final Metadata metadata) {
@Override
public void metadataUpdated(final Metadata metadata) {
+ super.metadataUpdated(metadata);
new Thread(new Runnable() {
@Override
public void run() {
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;
logger.info(String.format("Updating metadata to %s", metadataString));
Socket socket = null;
@@
-227,8
+229,8
@@
public class Icecast2Sink implements Sink {
}
/**
}
/**
- * Returns a MIME type for the given metadata. Currently only Vorbis, MP3,
and
- *
PCM
formats are recognized.
+ * Returns a MIME type for the given metadata. Currently only Vorbis, MP3,
PCM,
+ *
Ogg Vorbis, Opus, and FLAC
formats are recognized.
*
* @param metadata
* The metadata to get a MIME type for
*
* @param metadata
* The metadata to get a MIME type for
@@
-245,6
+247,15
@@
public class Icecast2Sink implements Sink {
if ("PCM".equalsIgnoreCase(encoding)) {
return "audio/vnd.wave";
}
if ("PCM".equalsIgnoreCase(encoding)) {
return "audio/vnd.wave";
}
+ if ("Vorbis".equalsIgnoreCase(encoding)) {
+ return "application/ogg";
+ }
+ if ("Opus".equalsIgnoreCase(encoding)) {
+ return "audio/ogg; codecs=opus";
+ }
+ if ("FLAC".equalsIgnoreCase(encoding)) {
+ return "audio/flac";
+ }
return "application/octet-stream";
}
return "application/octet-stream";
}