X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Ffilter%2FExternalMp3Decoder.java;h=f81d53290dfcf3dacc8080a136b7c5a26b76f5cc;hb=cbeadf6d9eea57ab98cacd60e2419dd3c18bef89;hp=ecdee68112475ee2834e1d0ada85da3ded5310ce;hpb=3e7a3956733424c04aaa11de1dfb26719eecb26e;p=sonitus.git
diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalMp3Decoder.java b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalMp3Decoder.java
index ecdee68..f81d532 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalMp3Decoder.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalMp3Decoder.java
@@ -17,43 +17,43 @@
package net.pterodactylus.sonitus.data.filter;
-import static com.google.common.base.Preconditions.*;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.inject.internal.util.$Preconditions.checkState;
-import net.pterodactylus.sonitus.data.ConnectException;
-import net.pterodactylus.sonitus.data.Format;
-import net.pterodactylus.sonitus.data.Source;
+import java.io.IOException;
+
+import net.pterodactylus.sonitus.data.Metadata;
/**
- * Basic {@link ExternalFilter} implementation that verifies that the connected
- * source is MP3-encoded and returns a PCM-encoded stream.
+ * Basic {@link net.pterodactylus.sonitus.data.filter.ExternalFilter}
+ * implementation that verifies that the connected source is MP3-encoded and
+ * returns a PCM-encoded stream.
*
* @author David âBombeâ Roden
*/
-public class ExternalMp3Decoder extends ExternalFilter {
+public abstract class ExternalMp3Decoder extends ExternalFilter {
/**
* Creates a new external MP3 decoder.
*
- * @param binary
- * The binary to execute
- * @param parameters
- * The parameters for the binary
+ * @param name
+ * The name of the filter
*/
- public ExternalMp3Decoder(String binary, Iterable parameters) {
- super(binary, parameters);
+ protected ExternalMp3Decoder(String name) {
+ super(name);
}
@Override
- public Format format() {
- return super.format().encoding("PCM");
+ public Metadata metadata() {
+ return super.metadata().encoding("PCM");
}
@Override
- public void connect(Source source) throws ConnectException {
- checkNotNull(source, "source must not be null");
- checkState(source.format().encoding().equalsIgnoreCase("MP3"), "source must be MP3-encoded");
+ public void open(Metadata metadata) throws IOException {
+ checkNotNull(metadata, "metadata must not be null");
+ checkState(metadata.encoding().equalsIgnoreCase("MP3"), "source must be MP3-encoded");
- super.connect(source);
+ super.open(metadata);
}
}