X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2FCommandlineHandler.java;h=b6e10cec0a2eb65c10a5b1e60f0b1a850ea25401;hb=1652ccdd294fb982628c4acb412206ad2bca1023;hp=9b32ebdba51ea4f8ec45167984e0e90f8d8c3688;hpb=c921086faa9d28c7e5c8d3d7a382a2c00901fb18;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
index 9b32ebd..b6e10ce 100755
--- 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");
 
@@ -43,30 +39,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,7 +56,6 @@ public class CommandlineHandler {
 
 		final EncodingOptions options = new EncodingOptions();
 
-		final Parser parser = initParser();
 		parser.parse(args);
 
 		if (recursiveParameter.isParameterSpecified())
@@ -87,9 +64,6 @@ public class CommandlineHandler {
 		if (deinterlaceParameter.isParameterSpecified())
 			options.deinterlace = true;
 
-		if (terminalParameter.isParameterSpecified())
-			options.terminal = true;
-
 		if (testParameter.isParameterSpecified())
 			options.testOnly = true;
 
@@ -107,9 +81,7 @@ public class CommandlineHandler {
 
 		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.");