X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FStreamSource.java;h=a116d803da4cdded15617247eed6fc01dcd5a970;hb=c548332c486d812bfce23a9121219bf86ecc5588;hp=d9df054f409cb352c7fdc38b77c814c020e239ec;hpb=333be3ce0c4f49a8b5ce447b80bb4491f0f7001d;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 d9df054..a116d80 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java
@@ -22,9 +22,12 @@ import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import net.pterodactylus.sonitus.data.ContentMetadata;
+import net.pterodactylus.sonitus.data.Controller;
 import net.pterodactylus.sonitus.data.FormatMetadata;
 import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.data.Source;
@@ -32,6 +35,7 @@ import net.pterodactylus.sonitus.io.MetadataStream;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Maps;
+import com.google.common.eventbus.EventBus;
 import com.google.common.primitives.Ints;
 
 /**
@@ -44,9 +48,15 @@ import com.google.common.primitives.Ints;
  */
 public class StreamSource implements Source {
 
+	/** The event bus. */
+	private final EventBus eventBus;
+
 	/** 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;
 
@@ -58,12 +68,15 @@ public class StreamSource implements Source {
 	 * 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 {
+	public StreamSource(EventBus eventBus, String streamUrl) throws IOException {
+		this.eventBus = eventBus;
 		this.streamUrl = streamUrl;
 		URL url = new URL(streamUrl);
 
@@ -111,6 +124,21 @@ public class StreamSource implements Source {
 
 		metadata = 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");
+	}
+
+	//
+	// CONTROLLED METHODS
+	//
+
+	@Override
+	public String name() {
+		return streamName;
+	}
+
+	@Override
+	public List<Controller<?>> controllers() {
+		return Collections.emptyList();
 	}
 
 	//
@@ -123,7 +151,8 @@ public class StreamSource implements Source {
 		if (!streamMetadata.isPresent()) {
 			return metadata;
 		}
-		return metadata = metadata.title(streamMetadata.get().title());
+		metadata = metadata.title(streamMetadata.get().title());
+		return metadata;
 	}
 
 	@Override