X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Ffilter%2FSoxResampleFilter.java;h=d4122594d3e1d495242e95c62bdde93f56622d17;hb=d3ab28bf3d751305328d02784d3a5eaf6b3ad81c;hp=69daa99603358d423a1ceb08b03dbb81c4f4fae2;hpb=6d43ae93cd0174757b7bad996572fb469eb3e154;p=sonitus.git diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/SoxResampleFilter.java b/src/main/java/net/pterodactylus/sonitus/data/filter/SoxResampleFilter.java index 69daa99..d412259 100644 --- a/src/main/java/net/pterodactylus/sonitus/data/filter/SoxResampleFilter.java +++ b/src/main/java/net/pterodactylus/sonitus/data/filter/SoxResampleFilter.java @@ -17,11 +17,12 @@ package net.pterodactylus.sonitus.data.filter; -import static com.google.common.base.Preconditions.*; +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.ConnectException; import net.pterodactylus.sonitus.data.Metadata; -import net.pterodactylus.sonitus.data.Source; import com.google.common.collect.ImmutableList; @@ -45,9 +46,9 @@ public class SoxResampleFilter extends ExternalFilter { * @param binary * The location of the binary * @param rate - * The new sampling rate */ public SoxResampleFilter(String binary, int rate) { + super(String.format("Resample to %s kHz", rate / 1000.0)); this.binary = binary; this.rate = rate; } @@ -57,16 +58,11 @@ public class SoxResampleFilter extends ExternalFilter { // @Override - public Metadata metadata() { - return super.metadata().frequency(rate); - } - - @Override - public void connect(Source source) throws ConnectException { - checkNotNull(source, "source must not be null"); - checkArgument(source.metadata().encoding().equalsIgnoreCase("PCM"), "source must be PCM-encoded"); + public void open(Metadata metadata) throws IOException { + checkNotNull(metadata, "metadata must not be null"); + checkArgument(metadata.encoding().equalsIgnoreCase("PCM"), "source must be PCM-encoded"); - super.connect(source); + super.open(metadata.frequency(rate)); } //