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=4cb47e19e5758ba951ab71e7690d8311f6adb72d;hpb=87436ac0b103a112722c1df835e11ec928e57d38;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 4cb47e1..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,6 +25,7 @@ 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;
@@ -32,12 +33,10 @@ import net.pterodactylus.sonitus.data.Controller;
 import net.pterodactylus.sonitus.data.FormatMetadata;
 import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.data.Source;
-import net.pterodactylus.sonitus.data.event.MetadataUpdated;
 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;
 
 /**
@@ -50,8 +49,8 @@ import com.google.common.primitives.Ints;
  */
 public class StreamSource extends AbstractControlledComponent implements Source {
 
-	/** The event bus. */
-	private final EventBus eventBus;
+	/** The logger. */
+	private static final Logger logger = Logger.getLogger(StreamSource.class.getName());
 
 	/** The URL of the stream. */
 	private final String streamUrl;
@@ -62,9 +61,6 @@ public class StreamSource extends AbstractControlledComponent implements Source
 	/** 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
@@ -77,8 +73,8 @@ public class StreamSource extends AbstractControlledComponent implements Source
 	 * @throws IOException
 	 * 		if an I/O error occurs
 	 */
-	public StreamSource(EventBus eventBus, String streamUrl) throws IOException {
-		this.eventBus = eventBus;
+	public StreamSource(String streamUrl) throws IOException {
+		super(null);
 		this.streamUrl = streamUrl;
 		URL url = new URL(streamUrl);
 
@@ -91,6 +87,7 @@ public class StreamSource extends AbstractControlledComponent implements Source
 		httpUrlConnection.setRequestProperty("ICY-Metadata", "1");
 
 		/* connect. */
+		logger.info(String.format("Connecting to %s...", streamUrl));
 		httpUrlConnection.connect();
 
 		/* check content type. */
@@ -124,7 +121,7 @@ public class StreamSource extends AbstractControlledComponent 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");
 	}
@@ -151,12 +148,10 @@ public class StreamSource extends AbstractControlledComponent implements Source
 	public Metadata metadata() {
 		Optional<ContentMetadata> streamMetadata = metadataStream.getContentMetadata();
 		if (!streamMetadata.isPresent()) {
-			return metadata;
+			return super.metadata();
 		}
-		metadata = metadata.title(streamMetadata.get().title());
-		fireMetadataUpdated(metadata);
-		eventBus.post(new MetadataUpdated(this, metadata));
-		return metadata;
+		metadataUpdated(super.metadata().title(streamMetadata.get().title()));
+		return super.metadata();
 	}
 
 	@Override
@@ -172,7 +167,7 @@ public class StreamSource extends AbstractControlledComponent implements Source
 
 	@Override
 	public String toString() {
-		return String.format("StreamSource(%s,%s)", streamUrl, metadata);
+		return String.format("StreamSource(%s,%s)", streamUrl, metadata());
 	}
 
 }