Merge pull request #11 from n8fr8/master

fixes for sox and ffmpeg

Author: n8fr8

src/net/sourceforge/sox/CrossfadeCat.java

@@ -1,6 +1,7 @@
 package net.sourceforge.sox;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 
 import android.util.Log;
@@ -36,7 +37,7 @@ public CrossfadeCat(SoxController controller, String firstFile, String secondFil
 		mFinalMix = outFile;
 	}
 
-	public boolean start() {
+	public boolean start() throws IOException {
 		// find length of first file
 		double length = mController.getLength(mFirstFile);
 
@@ -73,7 +74,7 @@ public boolean start() {
 		files.add(fadedOne);
 		files.add(fadedTwo);
 
-		String crossfaded = new File(mFirstFile).getAbsolutePath() + "-x-" + new File(mSecondFile).getName() +".wav";
+		String crossfaded = new File(mFirstFile).getCanonicalPath() + "-x-" + new File(mSecondFile).getName() +".wav";
 		crossfaded = mController.combineMix(files, crossfaded);
 		if( crossfaded == null )
 			return abort();

src/net/sourceforge/sox/SoxController.java

@@ -7,9 +7,11 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
 import org.ffmpeg.android.BinaryInstaller;
 import org.ffmpeg.android.ShellUtils.ShellCallback;
@@ -34,7 +36,7 @@ public SoxController(Context _context) throws FileNotFoundException, IOException
 			bi.installFromRaw();
 		}
 
-		soxBin = new File(fileBinDir,"sox").getAbsolutePath();
+		soxBin = new File(fileBinDir,"sox").getCanonicalPath();
 
 	}
 
@@ -112,11 +114,11 @@ public double getLength(String path) {
 	 * @param length (optional)
 	 * @return path to trimmed audio
 	 */
-	public String trimAudio(String path, String start, String length) {
+	public String trimAudio(String path, String start, String length) throws IOException {
 		ArrayList<String> cmd = new ArrayList<String>();
 
 		File file = new File(path);
-		String outFile = file.getAbsolutePath() + "_trimmed.wav";
+		String outFile = file.getCanonicalPath() + "_trimmed.wav";
 		cmd.add(soxBin);
 		cmd.add(path);
 		cmd.add("-e");
@@ -156,7 +158,7 @@ public String trimAudio(String path, String start, String length) {
 	 * @param fadeOutLength (optional)
 	 * @return
 	 */
-	public String fadeAudio(String path, String type, String fadeInLength, String stopTime, String fadeOutLength ) {
+	public String fadeAudio(String path, String type, String fadeInLength, String stopTime, String fadeOutLength ) throws IOException {
 
 		final List<String> curves = Arrays.asList( new String[]{ "q", "h", "t", "l", "p"} );
 
@@ -166,7 +168,7 @@ public String fadeAudio(String path, String type, String fadeInLength, String st
 		}
 
 		File file = new File(path);
-		String outFile = file.getAbsolutePath() + "_faded.wav";
+		String outFile = file.getCanonicalPath() + "_faded.wav";
 
 		ArrayList<String> cmd = new ArrayList<String>();
 		cmd.add(soxBin);
@@ -269,14 +271,16 @@ public String combine(List<String> files, String outFile) {
 	 * @param seconds
 	 */
 	public String formatTimePeriod(double seconds) {
-		String seconds_frac = new DecimalFormat("#.##").format(seconds);
-		return String.format("0:0:%s", seconds_frac);
+		DecimalFormat df = new DecimalFormat("#.##");
+		df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
+		 String seconds_frac = df.format(seconds);
+		return String.format(Locale.US, "0:0:%s", seconds_frac);
 	}
 
-	private int execSox(List<String> cmd, ShellCallback sc) throws IOException,
+	public int execSox(List<String> cmd, ShellCallback sc) throws IOException,
 			InterruptedException {
 
-		String soxBin = new File(fileBinDir, "sox").getAbsolutePath();
+		String soxBin = new File(fileBinDir, "sox").getCanonicalPath();
 		Runtime.getRuntime().exec("chmod 700 " + soxBin);
 		return execProcess(cmd, sc);
 	}

src/org/ffmpeg/android/BinaryInstaller.java

@@ -105,7 +105,7 @@ private static boolean streamToFile(InputStream stm, File outFile, boolean appen
         stmOut.close();
         stm.close();
 
-		Runtime.getRuntime().exec("chmod "+mode+" "+outFile.getAbsolutePath());
+		Runtime.getRuntime().exec("chmod "+mode+" "+outFile.getCanonicalPath());
 
 
         return true;
@@ -184,7 +184,7 @@ private static boolean isARMv6() {
 	 */
 	private static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException
 	{
-		final String abspath = file.getAbsolutePath();
+		final String abspath = file.getCanonicalPath();
 		// Write the iptables binary
 		final FileOutputStream out = new FileOutputStream(file);
 		InputStream is = ctx.getResources().openRawResource(resid);