X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2FEncoder.java;h=1ec9d035a60cf2b9c748a00658981e1f027edac9;hb=ba52d2d46b4c8fc8ea74a98afa9f606e1f139672;hp=e60140b63ab0dc5e72b35721805792c4d85d908f;hpb=565d9c726de9b50709027f9455d39499a17f4b25;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java b/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
index e60140b..1ec9d03 100755
--- a/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
@@ -44,7 +44,7 @@ public class Encoder implements Module {
 			// handle directory
 			for (final File subFile : sourceFile.listFiles())
 				if (subFile.isDirectory()) {
-					if (encodingOptions.recursive)
+					if (encodingOptions.isRecursive())
 						compileEncodingPlan(subFile);
 				} else
 					compileEncodingPlan(subFile);
@@ -58,7 +58,7 @@ public class Encoder implements Module {
 						.getFileExtension(sourceFile);
 
 				// encode source file into every desired target format
-				for (final String targetFormat : encodingOptions.outputFormats) {
+				for (final String targetFormat : encodingOptions.getOutputFormats()) {
 
 					// construct target file
 					final File targetFile = getTargetFile(sourceFile,
@@ -87,9 +87,11 @@ public class Encoder implements Module {
 											+ targetFormat
 											+ " format.");
 						else {
-							final AbstractConverter chosenFormat = formats.get(0);
+							final AbstractConverter chosenFormat = formats
+									.get(0);
 							final EncodingTask encodingTask = new EncodingTask(
-									sourceFile, targetFile, chosenFormat);
+									sourceFile, targetFile, chosenFormat,
+									targetFormat);
 
 							if (chosenFormat.isTerminalMandatory())
 								encodingTask.setUseTerminal(true);
@@ -110,7 +112,7 @@ public class Encoder implements Module {
 	public boolean fileMatchesInputPattern(final File file) {
 		final String fileName = file.getName().toLowerCase();
 
-		for (final String inputPattern : encodingOptions.inputPatterns)
+		for (final String inputPattern : encodingOptions.getInputPatterns())
 			if (WildCardMatcher.match(fileName, inputPattern.toLowerCase()))
 				return true;
 
@@ -152,9 +154,9 @@ public class Encoder implements Module {
 
 		encodingPlan = new EncodingPlan();
 
-		compileEncodingPlan(encodingOptions.workingDirectory);
+		compileEncodingPlan(encodingOptions.getWorkingDirectory());
 
-		if (!encodingOptions.testOnly)
+		if (!encodingOptions.isTestOnly())
 			try {
 				encodingPlan.execute(encodingOptions);
 			} catch (final Exception exception) {