projects
/
sonitus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull all interfaces into a single interface: Filter.
[sonitus.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sonitus
/
data
/
filter
/
LameMp3Encoder.java
diff --git
a/src/main/java/net/pterodactylus/sonitus/data/filter/LameMp3Encoder.java
b/src/main/java/net/pterodactylus/sonitus/data/filter/LameMp3Encoder.java
index
2436b52
..
ffd4cc6
100644
(file)
--- a/
src/main/java/net/pterodactylus/sonitus/data/filter/LameMp3Encoder.java
+++ b/
src/main/java/net/pterodactylus/sonitus/data/filter/LameMp3Encoder.java
@@
-19,7
+19,7
@@
package net.pterodactylus.sonitus.data.filter;
import java.util.Arrays;
import java.util.Arrays;
-import net.pterodactylus.sonitus.data.
Format
;
+import net.pterodactylus.sonitus.data.
Metadata
;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@
-69,7
+69,6
@@
public class LameMp3Encoder extends ExternalMp3Encoder {
* @param binary
* The location of the binary
* @param preset
* @param binary
* The location of the binary
* @param preset
- * The preset to use
*/
public LameMp3Encoder(String binary, Preset preset) {
this(binary, preset, -1);
*/
public LameMp3Encoder(String binary, Preset preset) {
this(binary, preset, -1);
@@
-81,7
+80,6
@@
public class LameMp3Encoder extends ExternalMp3Encoder {
* @param binary
* The location of the binary
* @param bitrate
* @param binary
* The location of the binary
* @param bitrate
- * The bitrate to encode to (in kbps)
*/
public LameMp3Encoder(String binary, int bitrate) {
this(binary, null, bitrate);
*/
public LameMp3Encoder(String binary, int bitrate) {
this(binary, null, bitrate);
@@
-95,9
+93,9
@@
public class LameMp3Encoder extends ExternalMp3Encoder {
* @param preset
* The preset to use
* @param bitrate
* @param preset
* The preset to use
* @param bitrate
- * The bitrate to encode to (in kbps)
*/
private LameMp3Encoder(String binary, Preset preset, int bitrate) {
*/
private LameMp3Encoder(String binary, Preset preset, int bitrate) {
+ super("LAME Encoder");
this.binary = binary;
this.preset = Optional.fromNullable(preset);
this.bitrate = (bitrate < 0) ? Optional.<Integer>absent() : Optional.<Integer>of(bitrate);
this.binary = binary;
this.preset = Optional.fromNullable(preset);
this.bitrate = (bitrate < 0) ? Optional.<Integer>absent() : Optional.<Integer>of(bitrate);
@@
-133,15
+131,15
@@
public class LameMp3Encoder extends ExternalMp3Encoder {
//
@Override
//
@Override
- protected String binary(
Format format
) {
+ protected String binary(
Metadata metadata
) {
return binary;
}
@Override
return binary;
}
@Override
- protected Iterable<String> parameters(
Format format
) {
- ImmutableList.Builder parameters = ImmutableList.builder();
+ protected Iterable<String> parameters(
Metadata metadata
) {
+ ImmutableList.Builder
<String>
parameters = ImmutableList.builder();
parameters.add("-r");
parameters.add("-r");
- parameters.add("-s").add(String.valueOf(
format
.frequency() / 1000.0));
+ parameters.add("-s").add(String.valueOf(
metadata
.frequency() / 1000.0));
if (swapBytes) {
parameters.add("-x");
}
if (swapBytes) {
parameters.add("-x");
}