Move format into metadata.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / filter / ExternalFilter.java

diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
index 497ba2a..9e298b4 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
 import net.pterodactylus.sonitus.data.ConnectException;
 import net.pterodactylus.sonitus.data.Connection;
 import net.pterodactylus.sonitus.data.Filter;
-import net.pterodactylus.sonitus.data.Format;
+import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.data.Source;
 import net.pterodactylus.sonitus.io.InputStreamDrainer;
 
@@ -49,8 +49,8 @@ public abstract class ExternalFilter implements Filter {
        /** The logger. */
        private final Logger logger = Logger.getLogger(getClass().getName());
 
-       /** The format of the source. */
-       private Format format;
+       /** The source. */
+       private Source source;
 
        /** The input stream that will hold the converted source. */
        private PipedInputStream pipedInputStream;
@@ -60,8 +60,8 @@ public abstract class ExternalFilter implements Filter {
        //
 
        @Override
-       public Format format() {
-               return format;
+       public Metadata metadata() {
+               return source.metadata();
        }
 
        @Override
@@ -78,9 +78,9 @@ public abstract class ExternalFilter implements Filter {
        public void connect(Source source) throws ConnectException {
                Preconditions.checkNotNull(source, "source must not be null");
 
-               format = source.format();
+               this.source = source;
                try {
-                       final Process process = Runtime.getRuntime().exec(Iterables.toArray(ImmutableList.<String>builder().add(binary(format)).addAll(parameters(format)).build(), String.class));
+                       final Process process = Runtime.getRuntime().exec(Iterables.toArray(ImmutableList.<String>builder().add(binary(source.metadata())).addAll(parameters(source.metadata())).build(), String.class));
                        final InputStream processOutput = process.getInputStream();
                        final OutputStream processInput = process.getOutputStream();
                        final InputStream processError = process.getErrorStream();
@@ -124,6 +124,11 @@ public abstract class ExternalFilter implements Filter {
                }
        }
 
+       @Override
+       public void metadataUpdated() {
+               /* ignore. */
+       }
+
        //
        // SUBCLASS METHODS
        //
@@ -131,19 +136,19 @@ public abstract class ExternalFilter implements Filter {
        /**
         * Returns the location of the binary to execute.
         *
-        * @param format
-        *              The format being processed
+        * @param metadata
+        *              The metadata being processed
         * @return The location of the binary to execute
         */
-       protected abstract String binary(Format format);
+       protected abstract String binary(Metadata metadata);
 
        /**
         * Returns the parameters for the binary.
         *
-        * @param format
-        *              The format being processed
+        * @param metadata
+        *              The metadata being processed
         * @return The parameters for the binary
         */
-       protected abstract Iterable<String> parameters(Format format);
+       protected abstract Iterable<String> parameters(Metadata metadata);
 
 }