X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Ffilter%2FOggVorbisDecoder.java;h=d98abe1c94a2e3208aed742d0f59fa1cff9dda37;hb=c548332c486d812bfce23a9121219bf86ecc5588;hp=2cd9035b9d5feaf6ce9fff0e8a420672b1f66587;hpb=e3a09df0969d06b9794ec2850d47a5522640eb26;p=sonitus.git diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/OggVorbisDecoder.java b/src/main/java/net/pterodactylus/sonitus/data/filter/OggVorbisDecoder.java index 2cd9035..d98abe1 100644 --- a/src/main/java/net/pterodactylus/sonitus/data/filter/OggVorbisDecoder.java +++ b/src/main/java/net/pterodactylus/sonitus/data/filter/OggVorbisDecoder.java @@ -17,12 +17,15 @@ package net.pterodactylus.sonitus.data.filter; -import net.pterodactylus.sonitus.data.ConnectException; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.io.IOException; + import net.pterodactylus.sonitus.data.Metadata; -import net.pterodactylus.sonitus.data.Source; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import com.google.common.eventbus.EventBus; /** * Ogg Vorbis decoder that uses {@code oggdec} (from the {@code vorbis-tools} @@ -41,10 +44,13 @@ public class OggVorbisDecoder extends ExternalFilter { /** * Creates a new Ogg Vorbis decoder. * + * @param eventBus + * The event bus * @param binary * The location of the binary */ - public OggVorbisDecoder(String binary) { + public OggVorbisDecoder(EventBus eventBus, String binary) { + super(eventBus, "Ogg Vorbis Decoder"); this.binary = binary; } @@ -70,11 +76,11 @@ public class OggVorbisDecoder extends ExternalFilter { } @Override - public void connect(Source source) throws ConnectException { - Preconditions.checkNotNull(source, "source must not be null"); - Preconditions.checkArgument(source.metadata().encoding().equalsIgnoreCase("Vorbis"), "source must be Vorbis-encoded"); + public void open(Metadata metadata) throws IOException { + checkNotNull(metadata, "metadata must not be null"); + checkArgument(metadata.encoding().equalsIgnoreCase("Vorbis"), "source must be Vorbis-encoded"); - super.connect(source); + super.open(metadata); } //