X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Ffilter%2FMultiSourceFilter.java;h=1dc3a8c5cc94538a71adfb12bf8be775704f1e0f;hb=865e9a8fce99285dfd6c1efb6a01991076e1a773;hp=fb52c9d73f154929da4ccb3c6ad5b730af0a06f0;hpb=ee261ec959322c6d1969aff67319559ba1480859;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/MultiSourceFilter.java b/src/main/java/net/pterodactylus/sonitus/data/filter/MultiSourceFilter.java
index fb52c9d..1dc3a8c 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/MultiSourceFilter.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/MultiSourceFilter.java
@@ -31,7 +31,6 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sonitus.data.ConnectException;
 import net.pterodactylus.sonitus.data.Filter;
-import net.pterodactylus.sonitus.data.Format;
 import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.data.ReusableSink;
 import net.pterodactylus.sonitus.data.Source;
@@ -66,13 +65,6 @@ public class MultiSourceFilter implements Filter, ReusableSink {
 	}
 
 	@Override
-	public Format format() {
-		synchronized (syncObject) {
-			return connection.source.format();
-		}
-	}
-
-	@Override
 	public Metadata metadata() {
 		synchronized (syncObject) {
 			return connection.source.metadata();
@@ -94,7 +86,9 @@ public class MultiSourceFilter implements Filter, ReusableSink {
 	public void connect(Source source) throws ConnectException {
 		checkNotNull(source, "source must not be null");
 		if ((connection != null) && (connection.source != null)) {
-			checkArgument(connection.source.format().equals(source.format()), "source’s format must equal this sink’s format");
+			checkArgument(connection.source.metadata().channels() == source.metadata().channels(), "source’s channel count must equal existing source’s channel count");
+			checkArgument(connection.source.metadata().frequency() == source.metadata().frequency(), "source’s frequency must equal existing source’s frequency");
+			checkArgument(connection.source.metadata().encoding().equalsIgnoreCase(source.metadata().encoding()), "source’s encoding must equal existing source’s encoding");
 		}
 
 		if (connection == null) {