X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fgrabmemcard%2FMain.java;h=dac58fd09230e36eac7e2f426aeac956b051e9b6;hb=0c2f581d34d28b96eb1b8d4eb53a54c2b4f2c43b;hp=9e779c8120c1465b3559feb9b0b787cdd6577a69;hpb=6b41bb3920609ef98b561d989778d32910812e9a;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
index 9e779c8..dac58fd 100755
--- a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java
+++ b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.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.
@@ -21,8 +21,8 @@ import eu.svjatoslav.meviz.encoder.BitrateParameter;
 import eu.svjatoslav.meviz.encoder.EncodingOptions;
 import eu.svjatoslav.meviz.encoder.EncodingPlan;
 import eu.svjatoslav.meviz.encoder.EncodingTask;
-import eu.svjatoslav.meviz.encoder.converters.Converter;
-import eu.svjatoslav.meviz.encoder.converters.Mts2Mp4;
+import eu.svjatoslav.meviz.encoder.converters.AbstractConverter;
+import eu.svjatoslav.meviz.encoder.converters.AvconvVideo;
 
 public class Main implements Module {
 
@@ -36,18 +36,16 @@ public class Main implements Module {
 				+ "/AVCHD/BDMV/STREAM/";
 		final File videosDirectory = new File(videosPath);
 
-		if (!videosDirectory.exists()) {
+		if (!videosDirectory.exists())
 			return new File[0];
-		}
 
 		return videosDirectory.listFiles();
 	}
 
 	public String getDoubleDigit(final int value) {
 		String valueString = Integer.toString(value);
-		if (valueString.length() == 1) {
+		if (valueString.length() == 1)
 			valueString = "0" + valueString;
-		}
 		return valueString;
 	};
 
@@ -88,14 +86,12 @@ public class Main implements Module {
 		final File targetDirectory = getTargetDirectory();
 		targetDirectory.mkdirs();
 
-		final Converter converter = new Mts2Mp4();
+		final AbstractConverter converter = new AvconvVideo();
 		final EncodingPlan encodingPlan = new EncodingPlan();
 
 		final String userName = System.getProperty("user.name");
 
-		// final File file = new File("/media/" + userName + "/");
-
-		final File file = new File("/media/");
+		final File file = new File("/media/" + userName + "/");
 
 		for (final File insertedDisk : file.listFiles()) {
 			final File[] diskVideos = getDiskVideos(insertedDisk);
@@ -112,13 +108,13 @@ public class Main implements Module {
 				final File targetFile = new File(targetFilePath.toString());
 
 				final EncodingTask encodingTask = new EncodingTask(sourceFile,
-						targetFile, converter);
+						targetFile, converter, "mp4");
 				encodingPlan.scheduleTask(encodingTask);
 			}
 		}
 
 		final EncodingOptions options = new EncodingOptions();
-		options.videoBitrate = BitrateParameter.bitrate.COPY;
+		options.setVideoBitrate(BitrateParameter.bitrate.COPY);
 
 		encodingPlan.execute(options);
 	}