X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2Fconverters%2FAvconvAudio.java;h=ae6cd283d510045a1a4f4d4491d4d56491928404;hb=4d4db68682e82b22cad94d20fbe7f3a1aab45407;hp=a87777f426ef7d5e17f897ac24e5b2659773eeab;hpb=565d9c726de9b50709027f9455d39499a17f4b25;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvAudio.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvAudio.java
index a87777f..ae6cd28 100755
--- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvAudio.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvAudio.java
@@ -1,44 +1,46 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright (C) 2012 -- 2019, 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.
- */
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+*/
 
 package eu.svjatoslav.meviz.encoder.converters;
 
+import eu.svjatoslav.meviz.encoder.EncodingOptions;
+
 import java.io.File;
 import java.util.List;
 
-import eu.svjatoslav.meviz.encoder.EncodingOptions;
-
 public class AvconvAudio extends AbstractConverter {
 
-	@Override
-	public String getCommand(final File inputFile, final File targetFile,
-			final EncodingOptions options) {
+    private static final String[] SUPPORTED_FORMATS = new String[]{"ogg", "wav", "mp3", "m4a", "flac"};
+
+    @Override
+    public String getCommand(final File inputFile, final File targetFile,
+                             final EncodingOptions options, String targetFormat) {
 
-		final String codecParams = "-b:a 192k";
+        final String codecParams = "-b:a 192k";
 
-		return "avconv -i \"" + inputFile.getAbsolutePath() + "\" "
-				+ codecParams + " \"" + targetFile.getAbsolutePath() + "\"";
-	}
+        return "avconv -i \"" + inputFile.getAbsolutePath() + "\" "
+                + codecParams + " \"" + targetFile.getAbsolutePath() + "\"";
+    }
 
-	@Override
-	public List<String> getSourceFileExtensions() {
-		return toList("ogg", "wav");
-	}
+    @Override
+    public List<String> getSourceFileExtensions() {
+        return toList(SUPPORTED_FORMATS);
+    }
 
-	@Override
-	public List<String> getTargetFileExtensions() {
-		return toList("mp3");
-	}
+    @Override
+    public List<String> getTargetFileExtensions() {
+        return toList(SUPPORTED_FORMATS);
+    }
 
-	@Override
-	public boolean isTerminalMandatory() {
-		return false;
-	}
+    @Override
+    public boolean isTerminalMandatory() {
+        return false;
+    }
 
 }