projects
/
sonitus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add URL of documentation to javadoc.
[sonitus.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sonitus
/
data
/
filter
/
ExternalMp3Decoder.java
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
..
bc8e341
100644
(file)
--- 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,38
@@
package net.pterodactylus.sonitus.data.filter;
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.Connect
Exception;
-import net.pterodactylus.sonitus.data.Format;
-import net.pterodactylus.sonitus.data.
Source
;
+import
java.io.IO
Exception;
+
+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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class ExternalMp3Decoder extends ExternalFilter {
+public
abstract
class ExternalMp3Decoder extends ExternalFilter {
/**
* Creates a new external MP3 decoder.
*
/**
* 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<String> parameters) {
- super(binary, parameters);
- }
-
- @Override
- public Format format() {
- return super.format().encoding("PCM");
+ protected ExternalMp3Decoder(String name) {
+ super(name);
}
@Override
}
@Override
- public void
connect(Source source) throws Connect
Exception {
- checkNotNull(
source, "source
must not be null");
- checkState(
source.format()
.encoding().equalsIgnoreCase("MP3"), "source must be MP3-encoded");
+ public void
open(Metadata metadata) throws IO
Exception {
+ checkNotNull(
metadata, "metadata
must not be null");
+ checkState(
metadata
.encoding().equalsIgnoreCase("MP3"), "source must be MP3-encoded");
- super.
connect(source
);
+ super.
open(metadata.encoding("PCM")
);
}
}
}
}