From 40fd6985c704f77de71ec3da5b164738a986d38d Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 16 Jun 2017 15:42:08 +0300 Subject: [PATCH 1/4] cleanups --- .../activities/RecordingActivity.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 d108070..2152572 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 @@ -182,7 +182,7 @@ public class RecordingActivity extends AppCompatActivity { sampleRate = Integer.parseInt(shared.getString(MainApplication.PREFERENCE_RATE, "")); sampleRate = Sound.getValidRecordRate(MainApplication.getInMode(this), sampleRate); if (sampleRate == -1) - sampleRate = Sound.DEFAULT_RATE; + throw new RuntimeException("Unable to initailze audio"); samplesUpdate = (int) (pitch.getPitchTime() * sampleRate / 1000.0); updateBufferSize(false); @@ -593,14 +593,16 @@ public class RecordingActivity extends AppCompatActivity { rs.open(samplesTime); - int min = AudioRecord.getMinBufferSize(sampleRate, MainApplication.getInMode(RecordingActivity.this), Sound.DEFAULT_AUDIOFORMAT); - if (min <= 0) { - throw new RuntimeException("Unable to initialize AudioRecord: Bad audio values"); - } - recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRate, MainApplication.getInMode(RecordingActivity.this), Sound.DEFAULT_AUDIOFORMAT, min * 2); + int c = MainApplication.getInMode(RecordingActivity.this); + int min = AudioRecord.getMinBufferSize(sampleRate, c, Sound.DEFAULT_AUDIOFORMAT); + if (min <= 0) + throw new RuntimeException("Unable to initialize AudioRecord: Bad audio values"); + recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRate, c, Sound.DEFAULT_AUDIOFORMAT, min * 2); if (recorder.getState() != AudioRecord.STATE_INITIALIZED) { - throw new RuntimeException("Unable to initialize AudioRecord"); + recorder = new AudioRecord(MediaRecorder.AudioSource.DEFAULT, sampleRate, c, Sound.DEFAULT_AUDIOFORMAT, min * 2); + if (recorder.getState() != AudioRecord.STATE_INITIALIZED) + throw new RuntimeException("Unable to initialize AudioRecord"); } long start = System.currentTimeMillis(); From fdcc4e312e78cabbcb557e0f682c9781eebdc563 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 16 Jun 2017 16:38:56 +0300 Subject: [PATCH 2/4] cleanups --- .../com/github/axet/audiorecorder/activities/MainActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java index 7188204..3981009 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java @@ -256,7 +256,6 @@ public class MainActivity extends AppCompatActivity { @Override protected void onDestroy() { super.onDestroy(); - recordings.close(); } From 807737ddf3667c12a0e358480eb7ca6989782a66 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 16 Jun 2017 19:23:17 +0300 Subject: [PATCH 3/4] fix double tap --- app/build.gradle | 2 +- .../axet/audiorecorder/activities/RecordingActivity.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8270b99..598fffe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,5 +43,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.github.axet:android-audio-library:0.0.53' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:0.0.54' // compile project(':android-audio-library') } 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 2152572..613af6e 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 @@ -222,7 +222,8 @@ public class RecordingActivity extends AppCompatActivity { done.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - done.setClickable(false); + if (encoder != null) + return; stopRecording(getString(R.string.encoding)); try { encoding(new Runnable() { @@ -800,7 +801,7 @@ public class RecordingActivity extends AppCompatActivity { RecordingService.startService(this, targetFile.getName(), thread != null, encoder != null); final ProgressDialog d = new ProgressDialog(this); - d.setTitle(getString(R.string.encoding_title)); + d.setTitle(R.string.encoding_title); d.setMessage(".../" + targetFile.getName()); d.setMax(100); d.setCancelable(false); From 40ea779ccb487f4caf0d5c1526005f2079b17097 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 16 Jun 2017 19:23:26 +0300 Subject: [PATCH 4/4] Bump version audiorecorder-1.7.3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 598fffe..4c1f5bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 - versionCode 152 - versionName "1.7.2" + versionCode 153 + versionName "1.7.3" } signingConfigs { release {