Move event and metadata handling into abstract base class.

[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 98fdd91..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
@@ -69,7 +69,6 @@ public class LameMp3Encoder extends ExternalMp3Encoder {
         * @param binary
         *              The location of the binary
         * @param preset
-        *              The preset to use
         */
        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
-        *              The bitrate to encode to (in kbps)
         */
        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
-        *              The bitrate to encode to (in kbps)
         */
        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);
@@ -139,7 +137,7 @@ public class LameMp3Encoder extends ExternalMp3Encoder {
 
        @Override
        protected Iterable<String> parameters(Metadata metadata) {
-               ImmutableList.Builder parameters = ImmutableList.builder();
+               ImmutableList.Builder<String> parameters = ImmutableList.builder();
                parameters.add("-r");
                parameters.add("-s").add(String.valueOf(metadata.frequency() / 1000.0));
                if (swapBytes) {