Add name to all controlled components.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / filter / OggVorbisDecoder.java

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 df1e2f1..b142fdd 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/OggVorbisDecoder.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/OggVorbisDecoder.java
@@ -17,11 +17,13 @@
 
 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;
 
 /**
@@ -45,6 +47,7 @@ public class OggVorbisDecoder extends ExternalFilter {
         *              The location of the binary
         */
        public OggVorbisDecoder(String binary) {
+               super("Ogg Vorbis Decoder");
                this.binary = binary;
        }
 
@@ -70,11 +73,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);
        }
 
        //
@@ -88,7 +91,7 @@ public class OggVorbisDecoder extends ExternalFilter {
 
        @Override
        protected Iterable<String> parameters(Metadata metadata) {
-               ImmutableList.Builder parameters = ImmutableList.builder();
+               ImmutableList.Builder<String> parameters = ImmutableList.builder();
                parameters.add("-R");
                if (swapBytes) {
                        parameters.add("-e").add("1");