From bc8408c1aa7bf2d6ea4b8245783257cf882ac9df Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 6 Nov 2020 10:33:13 +0300 Subject: [PATCH 1/4] fix saveAsWAV out file arg --- .../axet/audiorecorder/activities/RecordingActivity.java | 2 +- .../com/github/axet/audiorecorder/app/EncodingStorage.java | 2 ++ .../github/axet/audiorecorder/services/EncodingService.java | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java index 9a3c338..bfb40e4 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java @@ -350,7 +350,7 @@ public class RecordingActivity extends AppCompatThemeActivity { d.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - EncodingService.saveAsWAV(RecordingActivity.this, recording.storage.getTempRecording(), recording.storage.getNewFile(d.getCurrentPath(), FormatWAV.EXT), recording.getInfo()); + EncodingService.saveAsWAV(RecordingActivity.this, recording.storage.getTempRecording(), d.getCurrentPath(), recording.getInfo()); } }); d.show(); diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java b/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java index 6d8f34a..9824db8 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java @@ -10,6 +10,7 @@ import android.util.Xml; import com.github.axet.audiolibrary.app.RawSamples; import com.github.axet.audiolibrary.encoders.FileEncoder; +import com.github.axet.audiolibrary.encoders.FormatWAV; import com.github.axet.audiolibrary.encoders.OnFlyEncoding; import com.github.axet.audiolibrary.filters.AmplifierFilter; import com.github.axet.audiolibrary.filters.SkipSilenceFilter; @@ -221,6 +222,7 @@ public class EncodingStorage extends HashMap { } public void saveAsWAV(File in, File out, RawSamples.Info info) { + out = storage.getNewFile(out, FormatWAV.EXT); OnFlyEncoding fly = new OnFlyEncoding(storage, out, info); encoder = new FileEncoder(storage.getContext(), in, fly); encoding(encoder, fly, info, new Runnable() { diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java index 86906de..aa41a6e 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java @@ -209,8 +209,7 @@ public class EncodingService extends PersistentService { } else if (a.equals(SAVE_AS_WAV)) { try { File in = (File) intent.getSerializableExtra("in"); - File out = (File) intent.getSerializableExtra("out"); // dir - out = storage.getNewFile(out, FormatWAV.EXT); + File out = (File) intent.getSerializableExtra("out"); RawSamples.Info info = new RawSamples.Info(intent.getStringExtra("info")); if (encodings.encoder == null) encodings.saveAsWAV(in, out, info); From c108ae97b7ada46c9d2ce0e15ec0a372a9415986 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 6 Nov 2020 10:39:49 +0300 Subject: [PATCH 2/4] add exit method --- .../audiorecorder/app/EncodingStorage.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java b/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java index 9824db8..61896bb 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java @@ -145,9 +145,7 @@ public class EncodingStorage extends HashMap { encoding(encoder, fly, info.info, new Runnable() { @Override public void run() { - encoder.close(); - encoder = null; - startEncoding(); + restart(); } }); return; @@ -214,9 +212,7 @@ public class EncodingStorage extends HashMap { encoding(encoder, fly, info, new Runnable() { @Override public void run() { - encoder.close(); - encoder = null; - Post(EXIT, null); + exit(); } }); } @@ -228,13 +224,19 @@ public class EncodingStorage extends HashMap { encoding(encoder, fly, info, new Runnable() { @Override public void run() { - encoder.close(); - encoder = null; - Post(EXIT, null); + exit(); } }); } + public void exit() { + if (encoder != null) { + encoder.close(); + encoder = null; + } + Post(EXIT, null); + } + public void restart() { if (encoder != null) { encoder.close(); From b08bada14442eadc204fe599b98f1d1f346a2aea Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 8 Nov 2020 10:42:54 +0300 Subject: [PATCH 3/4] remove encoder queue on done --- .../com/github/axet/audiorecorder/app/EncodingStorage.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java b/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java index 61896bb..e958b62 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java @@ -87,11 +87,11 @@ public class EncodingStorage extends HashMap { File storage = this.storage.getTempRecording().getParentFile(); File[] ff = storage.listFiles(new FilenameFilter() { String start = Storage.getNameNoExt(Storage.TMP_ENC); - String ext = Storage.getExt(Storage.TMP_ENC); + String ext = "." + Storage.getExt(Storage.TMP_ENC); @Override public boolean accept(File dir, String name) { - return name.startsWith(start) && name.endsWith("." + ext); + return name.startsWith(start) && name.endsWith(ext); } }); if (ff == null) @@ -182,6 +182,7 @@ public class EncodingStorage extends HashMap { public void run() { // success Storage.delete(encoder.in); // delete raw recording Storage.delete(EncodingStorage.jsonFile(encoder.in)); // delete json file + remove(encoder.in); Post(DONE, new Intent() .putExtra("targetUri", fly.targetUri) ); From 2a7e32343e9b02a6b483756df5d1cd89d8a9acd7 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 8 Nov 2020 10:43:05 +0300 Subject: [PATCH 4/4] Bump version audiorecorder-3.3.21 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ec9d320..a9d8c0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 28 - versionCode 345 - versionName "3.3.20" + versionCode 346 + versionName "3.3.21" } signingConfigs { release {