m4v support

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

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
index 9b32ebd..ba54599 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
@@ -9,7 +9,6 @@
 
 package eu.svjatoslav.meviz.encoder;
 
-import eu.svjatoslav.commons.commandline.parameterparser.Parameter;
 import eu.svjatoslav.commons.commandline.parameterparser.Parser;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.DirectoryParameter;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter;
@@ -23,9 +22,6 @@ public class CommandlineHandler {
                        .createStringParameter("Encoding output format.")
                        .addAliases("-o", "--output-format").setMandatory();
 
-       NullParameter terminalParameter = parser.createNullParameter(
-                       "Enable popup terminal.").addAliases("--terminal");
-
        NullParameter deinterlaceParameter = parser.createNullParameter(
                        "Deinterlace video.").addAliases("--deinterlace", "-d");
 
@@ -35,6 +31,9 @@ public class CommandlineHandler {
        NullParameter recursiveParameter = parser.createNullParameter(
                        "Enable recursive mode.").addAliases("-r", "--recursive");
 
+       NullParameter forPortableParameter = parser.createNullParameter(
+                       "Encode for portable player.").addAliases("-p", "--portable");
+
        StringParameter inputPatternParameter = parser
                        .createStringParameter("File input pattern.")
                        .addAliases("-i", "--input-pattern").setMandatory();
@@ -43,30 +42,12 @@ public class CommandlineHandler {
                        .createDirectoryParameter("Working directory.")
                        .addAliases("-w", "--working-directory").mustExist();
 
-       Parameter videoBitrateParameter = parser.createCustomParameter(
-                       new Bitrate(), "Video bitrate.")
-                       .addAliases("-v", "--video-bitrate");
-
-       public Parser initParser() {
-               final Parser parser = new Parser();
-
-               parser.addParameter(recursiveParameter);
-
-               parser.addParameter(deinterlaceParameter);
-
-               parser.addParameter(testParameter);
-
-               parser.addParameter(terminalParameter);
-
-               parser.addParameter(outputFormatParameter);
-
-               parser.addParameter(inputPatternParameter);
-
-               parser.addParameter(workingDirectoryParameter);
+       BitrateParameter videoBitrateParameter = new BitrateParameter(
+                       "Video bitrate");
 
+       public CommandlineHandler() {
+               videoBitrateParameter.addAliases("-v", "--video-bitrate");
                parser.addParameter(videoBitrateParameter);
-
-               return parser;
        }
 
        /**
@@ -78,20 +59,13 @@ public class CommandlineHandler {
 
                final EncodingOptions options = new EncodingOptions();
 
-               final Parser parser = initParser();
                parser.parse(args);
 
-               if (recursiveParameter.isParameterSpecified())
-                       options.recursive = true;
-
-               if (deinterlaceParameter.isParameterSpecified())
-                       options.deinterlace = true;
+               options.recursive = recursiveParameter.isParameterSpecified();
 
-               if (terminalParameter.isParameterSpecified())
-                       options.terminal = true;
+               options.deinterlace = deinterlaceParameter.isParameterSpecified();
 
-               if (testParameter.isParameterSpecified())
-                       options.testOnly = true;
+               options.testOnly = testParameter.isParameterSpecified();
 
                if (outputFormatParameter.isParameterSpecified())
                        options.outputFormats.addAll(outputFormatParameter
@@ -105,11 +79,11 @@ public class CommandlineHandler {
                        options.inputPatterns.addAll(inputPatternParameter
                                        .getArgumentsAsStrings());
 
+               options.forPortablePlayer = forPortableParameter.isParameterSpecified();
+
                if (videoBitrateParameter.isParameterSpecified())
                        try {
-                               options.videoBitrate = Bitrate.bitrate
-                                               .valueOf(videoBitrateParameter.getArgumentsAsStrings()
-                                                               .get(0).toUpperCase());
+                               options.videoBitrate = videoBitrateParameter.getValue();
                        } catch (final Exception e) {
                                System.out
                                                .println("Invalid video bitrate. Valid values are: LOW, MEDIUM, HIGH.");