X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FStreamSource.java;h=dc6e4d0e48255fd78e67bf55bff7bc0eb0dca518;hb=b464acd1f117fa1310c8551f572ce986a575cf94;hp=8c7464ca6224c09122b3d2b14b05e3e9587f49a3;hpb=9a5bbdb694cda8f4bc0794aea136b993399961dd;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 8c7464c..dc6e4d0 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java
@@ -25,7 +25,9 @@ import java.net.URLConnection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
+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 +47,34 @@ import com.google.common.primitives.Ints;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class StreamSource implements Source {
+public class StreamSource extends AbstractControlledComponent implements Source {
+
+	/** The logger. */
+	private static final Logger logger = Logger.getLogger(StreamSource.class.getName());
 
 	/** 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);
 
@@ -79,6 +87,7 @@ public class StreamSource implements Source {
 		httpUrlConnection.setRequestProperty("ICY-Metadata", "1");
 
 		/* connect. */
+		logger.info(String.format("Connecting to %s...", streamUrl));
 		httpUrlConnection.connect();
 
 		/* check content type. */
@@ -112,8 +121,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,7 +131,12 @@ public class StreamSource implements Source {
 	//
 
 	@Override
-	public List<Controller> controllers() {
+	public String name() {
+		return streamName;
+	}
+
+	@Override
+	public List<Controller<?>> controllers() {
 		return Collections.emptyList();
 	}
 
@@ -133,9 +148,10 @@ public class StreamSource implements Source {
 	public Metadata metadata() {
 		Optional<ContentMetadata> 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 +167,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());
 	}
 
 }