fixed typo

[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 102ca7a..e83b4b8 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
@@ -11,6 +11,7 @@ package eu.svjatoslav.meviz.encoder;
 
 import eu.svjatoslav.commons.commandline.parameterparser.Parser;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.DirectoryParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.IntegerParameter;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameters;
 
@@ -18,37 +19,34 @@ public class CommandlineHandler {
 
        Parser parser = new Parser();
 
-       StringParameters outputFormatParameter = parser
-                       .createStringParameters("Encoding output format.")
+       StringParameters outputFormatParameter = parser.add(new StringParameters("Encoding output format."))
                        .addAliases("-o", "--output-format").setMandatory();
 
-       NullParameter deinterlaceParameter = parser.createNullParameter(
-                       "Deinterlace video.").addAliases("--deinterlace", "-d");
+       IntegerParameter targetFramerate = parser
+                       .add(new IntegerParameter("Target framerate.").addAliases("-f", "--target-framerate"));
 
-       NullParameter testParameter = parser.createNullParameter(
-                       "Simulate file encoding.").addAliases("-t", "--test");
+       NullParameter deinterlaceParameter = parser.add(new NullParameter("Deinterlace video.")).addAliases("-d",
+                       "--deinterlace");
 
-       NullParameter recursiveParameter = parser.createNullParameter(
-                       "Enable recursive mode.").addAliases("-r", "--recursive");
+       NullParameter testParameter = parser.add(new NullParameter("Simulate file encoding.")).addAliases("-t", "--test");
 
-       NullParameter forPortableParameter = parser.createNullParameter(
-                       "Encode for portable player.").addAliases("-p", "--portable");
+       NullParameter recursiveParameter = parser.add(new NullParameter("Enable recursive mode.")).addAliases("-r",
+                       "--recursive");
 
-       StringParameters inputPatternParameter = parser
-                       .createStringParameters("File input pattern.")
+       NullParameter forPortableParameter = parser.add(new NullParameter("Encode for portable player.")).addAliases("-p",
+                       "--portable");
+
+       StringParameters inputPatternParameter = parser.add(new StringParameters("File input pattern."))
                        .addAliases("-i", "--input-pattern").setMandatory();
 
-       DirectoryParameter workingDirectoryParameter = parser
-                       .createDirectoryParameter("Working directory.")
+       DirectoryParameter workingDirectoryParameter = parser.add(new DirectoryParameter("Working directory."))
                        .addAliases("-w", "--working-directory").mustExist();
 
-       BitrateParameter videoBitrateParameter = new BitrateParameter(
-                       "Video bitrate");
+       BitrateParameter videoBitrateParameter = parser.add(new BitrateParameter("Video bitrate")).addAliases("-v",
+                       "--video-bitrate");
 
-       public CommandlineHandler() {
-               videoBitrateParameter.addAliases("-v", "--video-bitrate");
-               parser.addParameter(videoBitrateParameter);
-       }
+       BitrateParameter audioBitrateParameter = parser.add(new BitrateParameter("Audio bitrate")).addAliases("-a",
+                       "--audio-bitrate");
 
        /**
         * @return {@link EncodingOptions} if commandline arguments were
@@ -61,31 +59,31 @@ public class CommandlineHandler {
 
                parser.parse(args);
 
-               options.recursive = recursiveParameter.isParameterSpecified();
+               options.setRecursive(recursiveParameter.isParameterSpecified());
 
-               options.deinterlace = deinterlaceParameter.isParameterSpecified();
+               options.setDeinterlace(deinterlaceParameter.isParameterSpecified());
 
-               options.testOnly = testParameter.isParameterSpecified();
+               options.setTestOnly(testParameter.isParameterSpecified());
 
                if (outputFormatParameter.isParameterSpecified())
-                       options.outputFormats.addAll(outputFormatParameter.getValue());
+                       options.getOutputFormats().addAll(outputFormatParameter.getValue());
+
+               if (targetFramerate.isParameterSpecified())
+                       options.setTargetFps(targetFramerate.getValue());
 
                if (workingDirectoryParameter.isParameterSpecified())
-                       options.workingDirectory = workingDirectoryParameter.getValue();
+                       options.setWorkingDirectory(workingDirectoryParameter.getValue());
 
                if (inputPatternParameter.isParameterSpecified())
-                       options.inputPatterns.addAll(inputPatternParameter.getValue());
+                       options.getInputPatterns().addAll(inputPatternParameter.getValue());
 
-               options.forPortablePlayer = forPortableParameter.isParameterSpecified();
+               options.setForPortablePlayer(forPortableParameter.isParameterSpecified());
 
                if (videoBitrateParameter.isParameterSpecified())
-                       try {
-                               options.videoBitrate = videoBitrateParameter.getValue();
-                       } catch (final Exception e) {
-                               System.out
-                                               .println("Invalid video bitrate. Valid values are: LOW, MEDIUM, HIGH.");
-                               return null;
-                       }
+                       options.setVideoBitrate(videoBitrateParameter.getValue());
+
+               if (audioBitrateParameter.isParameterSpecified())
+                       options.setAudioBitrate(audioBitrateParameter.getValue());
 
                return options;
        }