X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Ffilter%2FOggVorbisDecoder.java;h=93ff3aafe8312fe6c55e6a55102fe82271877f93;hb=d3ab28bf3d751305328d02784d3a5eaf6b3ad81c;hp=df1e2f17471b7b3ad4154ad7cfb73dcbdf7071a3;hpb=232733212d941b29fdaa0b1db134f9e8d6dcbcee;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 df1e2f1..93ff3aa 100644
--- 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;
 	}
 
@@ -65,16 +68,11 @@ public class OggVorbisDecoder extends ExternalFilter {
 	//
 
 	@Override
-	public Metadata metadata() {
-		return super.metadata().encoding("PCM");
-	}
-
-	@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.encoding("PCM"));
 	}
 
 	//
@@ -88,7 +86,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");