bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-3.2.0'

Browse source
This commit is contained in:
Alexey Kuznetsov 2018-03-18 13:09:44 +03:00
commit c85137f13f
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -10,8 +10,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23 // 24+ file:// unable to open
versionCode 256
versionName "3.1.25"
versionCode 257
versionName "3.2.0"
}
signingConfigs {
release {
@ -55,5 +55,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.github.axet:android-audio-library:1.0.93' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:1.0.94' // compile project(':android-audio-library')
}

5
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -48,6 +48,7 @@ import com.github.axet.audiolibrary.encoders.Factory;
import com.github.axet.audiolibrary.encoders.FileEncoder;
import com.github.axet.audiolibrary.encoders.OnFlyEncoding;
import com.github.axet.audiolibrary.filters.AmplifierFilter;
import com.github.axet.audiolibrary.filters.SkipSilenceFilter;
import com.github.axet.audiolibrary.filters.VoiceFilter;
import com.github.axet.audiolibrary.widgets.PitchView;
import com.github.axet.audiorecorder.BuildConfig;
@ -994,9 +995,11 @@ public class RecordingActivity extends AppCompatThemeActivity {
if (shared.getBoolean(MainApplication.PREFERENCE_VOICE, false))
encoder.filters.add(new VoiceFilter(getInfo()));
float amp = shared.getFloat(MainApplication.PREFERENCE_VOLUME, 0);
float amp = shared.getFloat(MainApplication.PREFERENCE_VOLUME, 1);
if (amp != 1)
encoder.filters.add(new AmplifierFilter(amp));
if (shared.getBoolean(MainApplication.PREFERENCE_SKIP, false))
encoder.filters.add(new SkipSilenceFilter(getInfo()));
RecordingService.startService(this, Storage.getDocumentName(targetUri), thread != null, encoder != null);

3
app/src/main/res/layout/content_main.xml
View file

@ -25,7 +25,8 @@
android:id="@+id/empty_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:padding="5dp">
<View
android:layout_width="match_parent"

5
app/src/main/res/xml/pref_general.xml
View file

@ -68,6 +68,11 @@
android:key="volume"
android:summary=""
android:title="@string/pref_volume_title" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="skip"
android:summary="@string/pref_skip_summary"
android:title="@string/pref_skip_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_application">
<SwitchPreferenceCompat