X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FMultiSource.java;h=565ff3eb3c084bec7231f840c44e8159a48fa7c3;hb=2963e4b6e2e6b50dbfecdb06fcd739592bc3b4d5;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..565ff3e 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; @@ -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,7 +145,7 @@ 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);