From 21d987faf2ffddd698c26c8bdf80d291ca1b2ba3 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 2 May 2017 14:17:35 +0300 Subject: [PATCH] fix oggs --- app/build.gradle | 2 +- .../audiorecorder/activities/MainActivity.java | 16 ---------------- .../activities/RecordingActivity.java | 5 ++--- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ee82344..4aa6717 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.24' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:0.0.29' // compile project(':android-audio-library') } 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 eaa0806..968af71 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 @@ -4,23 +4,18 @@ import android.Manifest; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageManager; import android.content.res.Configuration; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.WindowManager; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; @@ -236,17 +231,6 @@ public class MainActivity extends AppCompatActivity { recordings.close(); } - @Override - public void onStart() { - super.onStart(); - } - - - @Override - public void onStop() { - super.onStop(); - } - void updateHeader() { File f = storage.getStoragePath(); long free = storage.getFree(f); 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 9e68c00..19f11c9 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 @@ -35,7 +35,6 @@ import android.widget.TextView; import android.widget.Toast; import com.github.axet.androidlibrary.animations.MarginBottomAnimation; -import com.github.axet.androidlibrary.app.MainLibrary; import com.github.axet.audiolibrary.app.RawSamples; import com.github.axet.audiolibrary.app.Sound; import com.github.axet.audiolibrary.app.Storage; @@ -721,7 +720,7 @@ public class RecordingActivity extends AppCompatActivity { void updateSamples(long samplesTime) { long ms = samplesTime / sampleRate * 1000; - time.setText(MainLibrary.formatDuration(this, ms)); + time.setText(MainApplication.formatDuration(this, ms)); } @Override @@ -790,7 +789,7 @@ public class RecordingActivity extends AppCompatActivity { final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this); String ext = shared.getString(MainApplication.PREFERENCE_ENCODING, ""); - e = Factory.getEncoder(ext, info, out); + e = Factory.getEncoder(this, ext, info, out); encoder = new FileEncoder(this, in, e);