X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FStreamSource.java;h=8b0c518896440e0e058d559331acab2c51d51e7c;hb=1cb3955aa53eee7acfbfd9228d60cfb6ddf747f3;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..8b0c518 100644 --- a/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java +++ b/src/main/java/net/pterodactylus/sonitus/data/source/StreamSource.java @@ -25,12 +25,15 @@ 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.AbstractFilter; import net.pterodactylus.sonitus.data.ContentMetadata; import net.pterodactylus.sonitus.data.Controller; +import net.pterodactylus.sonitus.data.DataPacket; +import net.pterodactylus.sonitus.data.Filter; import net.pterodactylus.sonitus.data.FormatMetadata; import net.pterodactylus.sonitus.data.Metadata; -import net.pterodactylus.sonitus.data.Source; import net.pterodactylus.sonitus.io.MetadataStream; import com.google.common.base.Optional; @@ -38,24 +41,27 @@ import com.google.common.collect.Maps; import com.google.common.primitives.Ints; /** - * {@link Source} implementation that can download an audio stream from a + * {@link Filter} implementation that can download an audio stream from a * streaming server. *
* Currently only âaudio/mpegâ (aka MP3) streams are supported. * * @author David âBombeâ Roden */ -public class StreamSource implements Source { +public class StreamSource extends AbstractFilter { + + /** 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 @@ -67,6 +73,7 @@ public class StreamSource implements Source { * if an I/O error occurs */ public StreamSource(String streamUrl) throws IOException { + super(null); this.streamUrl = streamUrl; URL url = new URL(streamUrl); @@ -79,6 +86,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,37 +120,45 @@ 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"); } // - // CONTROLLED METHODS + // FILTER METHODS // @Override - public List