Refactored to remove code duplication.

[meviz.git] / src / main / java / eu / svjatoslav / meviz / encoder / Encoder.java

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java b/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
index 3b2f043..e60140b 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
@@ -15,7 +15,7 @@ import java.util.List;
 import eu.svjatoslav.commons.file.FilePathParser;
 import eu.svjatoslav.commons.string.WildCardMatcher;
 import eu.svjatoslav.meviz.Module;
-import eu.svjatoslav.meviz.encoder.converters.Converter;
+import eu.svjatoslav.meviz.encoder.converters.AbstractConverter;
 
 public class Encoder implements Module {
 
@@ -69,7 +69,7 @@ public class Encoder implements Module {
 
                                        if (!targetFile.exists()) {
 
-                                               final List<eu.svjatoslav.meviz.encoder.converters.Converter> formats = encoderRegistry
+                                               final List<eu.svjatoslav.meviz.encoder.converters.AbstractConverter> formats = encoderRegistry
                                                                .getEncoders(sourceFileExtension, targetFormat);
 
                                                if (formats.size() == 0)
@@ -87,12 +87,11 @@ public class Encoder implements Module {
                                                                                        + targetFormat
                                                                                        + " format.");
                                                else {
-                                                       final Converter chosenFormat = formats.get(0);
+                                                       final AbstractConverter chosenFormat = formats.get(0);
                                                        final EncodingTask encodingTask = new EncodingTask(
                                                                        sourceFile, targetFile, chosenFormat);
 
-                                                       if (encodingOptions.terminal
-                                                                       || chosenFormat.isTerminalMandatory())
+                                                       if (chosenFormat.isTerminalMandatory())
                                                                encodingTask.setUseTerminal(true);
                                                        encodingPlan.scheduleTask(encodingTask);
                                                }
@@ -166,7 +165,7 @@ public class Encoder implements Module {
 
        @Override
        public void showCommandlineHelp() {
-               commandlineHandler.initParser().showHelp();
+               commandlineHandler.parser.showHelp();
                System.out.println("Example commands:");
                System.out
                                .println("    Convert all MTS files in the current directory into MP4's.");