X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FStreamSource.java;h=a55654fd3c99a2f78610428382c6be3ea44b1ca3;hb=cbeadf6d9eea57ab98cacd60e2419dd3c18bef89;hp=90cf6458560526f3ebaf83a9c900280775c772dc;hpb=f761d816f6e2f14bc80efb45e4cb5c130fa9a57f;p=sonitus.git
diff --git a/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java b/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java
index 90cf645..a55654f 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import net.pterodactylus.sonitus.data.AbstractControlledComponent;
import net.pterodactylus.sonitus.data.ContentMetadata;
import net.pterodactylus.sonitus.data.Controller;
import net.pterodactylus.sonitus.data.FormatMetadata;
@@ -45,28 +46,31 @@ import com.google.common.primitives.Ints;
*
* @author David âBombeâ Roden
*/
-public class StreamSource implements Source {
+public class StreamSource extends AbstractControlledComponent implements Source {
/** The URL of the stream. */
private final String streamUrl;
+ /** The name of the station. */
+ private final String streamName;
+
/** The metadata stream. */
private final MetadataStream metadataStream;
- /** The current metadata. */
- private Metadata metadata;
-
/**
* Creates a new stream source. This will also connect to the server and parse
* the response header for vital information (sampling frequency, number of
* channels, etc.).
*
+ * @param eventBus
+ * The event bus
* @param streamUrl
* The URL of the stream
* @throws IOException
* if an I/O error occurs
*/
public StreamSource(String streamUrl) throws IOException {
+ super(null);
this.streamUrl = streamUrl;
URL url = new URL(streamUrl);
@@ -112,8 +116,9 @@ public class StreamSource implements Source {
throw new IllegalArgumentException(String.format("Invalid Metadata Interval header: %s", metadataIntervalHeader));
}
- metadata = new Metadata(new FormatMetadata(audioParameters.get("ice-channels"), audioParameters.get("ice-samplerate"), "MP3"), new ContentMetadata());
+ metadataUpdated(new Metadata(new FormatMetadata(audioParameters.get("ice-channels"), audioParameters.get("ice-samplerate"), "MP3"), new ContentMetadata()));
metadataStream = new MetadataStream(new BufferedInputStream(httpUrlConnection.getInputStream()), metadataInterval);
+ streamName = httpUrlConnection.getHeaderField("ICY-Name");
}
//
@@ -121,6 +126,11 @@ public class StreamSource implements Source {
//
@Override
+ public String name() {
+ return streamName;
+ }
+
+ @Override
public List> controllers() {
return Collections.emptyList();
}
@@ -133,9 +143,10 @@ public class StreamSource implements Source {
public Metadata metadata() {
Optional streamMetadata = metadataStream.getContentMetadata();
if (!streamMetadata.isPresent()) {
- return metadata;
+ return super.metadata();
}
- return metadata = metadata.title(streamMetadata.get().title());
+ metadataUpdated(super.metadata().title(streamMetadata.get().title()));
+ return super.metadata();
}
@Override
@@ -151,7 +162,7 @@ public class StreamSource implements Source {
@Override
public String toString() {
- return String.format("StreamSource(%s,%s)", streamUrl, metadata);
+ return String.format("StreamSource(%s,%s)", streamUrl, metadata());
}
}