X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FMultiSource.java;h=21239863299dce47bc6ed726a400a8a21ac71433;hb=cbeadf6d9eea57ab98cacd60e2419dd3c18bef89;hp=13cf0309c19a55f097c015f404b0e7f84fcfa9c4;hpb=e89b413f56de06f24b223bb2cc4ed3973424d5ee;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 13cf030..2123986 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
@@ -26,10 +26,9 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Logger;
+import net.pterodactylus.sonitus.data.AbstractControlledComponent;
import net.pterodactylus.sonitus.data.Controller;
-import net.pterodactylus.sonitus.data.Metadata;
import net.pterodactylus.sonitus.data.Source;
-import net.pterodactylus.sonitus.data.event.MetadataUpdated;
import net.pterodactylus.sonitus.data.event.SourceFinishedEvent;
import com.google.common.eventbus.EventBus;
@@ -42,7 +41,7 @@ import com.google.inject.Inject;
*
* @author David âBombeâ Roden
*/
-public class MultiSource implements Source {
+public class MultiSource extends AbstractControlledComponent implements Source {
/** The logger. */
private static final Logger logger = Logger.getLogger(MultiSource.class.getName());
@@ -58,12 +57,10 @@ public class MultiSource implements Source {
/**
* Creates a new multi source.
- *
- * @param eventBus
- * The event bus
*/
@Inject
public MultiSource(EventBus eventBus) {
+ super("Multisource");
this.eventBus = eventBus;
}
@@ -86,7 +83,7 @@ public class MultiSource implements Source {
sourceChanged = true;
this.source.notifyAll();
}
- eventBus.post(new MetadataUpdated(this, source.metadata()));
+ metadataUpdated(source.metadata());
logger.info(String.format("Next Source set: %s", source));
}
}
@@ -96,11 +93,6 @@ public class MultiSource implements Source {
//
@Override
- public String name() {
- return "Multisource";
- }
-
- @Override
public List> controllers() {
return Collections.emptyList();
}
@@ -110,11 +102,6 @@ public class MultiSource implements Source {
//
@Override
- public Metadata metadata() {
- return source.get().metadata();
- }
-
- @Override
public byte[] get(int bufferSize) throws EOFException, IOException {
while (true) {
try {