X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FMultiSource.java;h=645a41db47cc27a3178791614d6c58f8b2aa3fd6;hb=34143658ae3c5157af1e145321618b1c244f5410;hp=b8afd82edf08354e5723f9e1781229a212767baf;hpb=1b5da82617f1ba7e569c63daf4fb981d0fd7f406;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java b/src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
index b8afd82..645a41d 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
@@ -29,6 +29,7 @@ import javax.swing.event.EventListenerList;
 
 import net.pterodactylus.sonitus.data.AbstractFilter;
 import net.pterodactylus.sonitus.data.Controller;
+import net.pterodactylus.sonitus.data.DataPacket;
 import net.pterodactylus.sonitus.data.Filter;
 import net.pterodactylus.sonitus.data.Metadata;
 
@@ -104,7 +105,7 @@ public class MultiSource extends AbstractFilter {
 				this.source.notifyAll();
 			}
 			metadataUpdated(source.metadata());
-			logger.info(String.format("Next Source set: %s", source));
+			logger.info(String.format("Next Source set: %s", source.name()));
 		}
 	}
 
@@ -135,7 +136,7 @@ public class MultiSource extends AbstractFilter {
 
 	@Override
 	public Metadata metadata() {
-		if (super.metadata() == null) {
+		if (super.metadata() == Metadata.UNKNOWN) {
 			/* no metadata yet, wait for it. */
 			waitForNewSource();
 			sourceChanged = false;
@@ -144,11 +145,12 @@ public class MultiSource extends AbstractFilter {
 	}
 
 	@Override
-	public byte[] get(int bufferSize) throws EOFException, IOException {
+	public DataPacket get(int bufferSize) throws EOFException, IOException {
 		while (true) {
 			try {
 				return source.get().get(bufferSize);
 			} catch (EOFException eofe1) {
+				logger.info(String.format("Got EOF from %s.", source.get().name()));
 				waitForNewSource();
 			} finally {
 				synchronized (source) {