use accessor methods for Encoding Options

[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 879c6da..1ec9d03 100755 (executable)
--- 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.
@@ -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 {
 
@@ -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,
@@ -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,9 +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);
+                                                                       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) {