From 475ec19d438a7c844c58dac2da6145c8a06b8829 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Tue, 14 Feb 2017 17:26:20 +0300
Subject: [PATCH] fix file list

---
 app/build.gradle                                          | 2 +-
 .../axet/audiorecorder/activities/MainActivity.java       | 2 ++
 .../java/com/github/axet/audiorecorder/app/Sound.java     | 2 +-
 .../java/com/github/axet/audiorecorder/app/Storage.java   | 2 +-
 .../com/github/axet/audiorecorder/encoders/Factory.java   | 8 +++++---
 .../com/github/axet/audiorecorder/encoders/FormatMKA.java | 4 +++-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b07e9bc..57b87b9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,6 @@ dependencies {
     compile 'com.android.support:design:25.1.1'
     compile 'com.google.android.gms:play-services-appindexing:9.8.0'
     compile 'org.apache.commons:commons-math3:3.6.1'
-    compile 'com.github.axet:android-library:1.8.2' // compile project(':android-library')
+    compile 'com.github.axet:android-library:1.9.0' // compile project(':android-library')
     compile 'com.github.axet:jebml:0.0.1' // compile project(':jebml')
 }
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 2b798a6..332941d 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
@@ -388,6 +388,8 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
             }
 
             if (!playing) {
+                playerStop(); // clear player instance
+                updatePlayerText(v, f); // update length
                 return;
             }
 
diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/Sound.java b/app/src/main/java/com/github/axet/audiorecorder/app/Sound.java
index e1f62d6..e4f25cb 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/app/Sound.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/app/Sound.java
@@ -7,7 +7,7 @@ import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.preference.PreferenceManager;
 
-public class Sound extends com.github.axet.androidlibrary.app.Sound {
+public class Sound extends com.github.axet.androidlibrary.sound.Sound {
 
     public Sound(Context context) {
         super(context);
diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java b/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java
index 43a229d..efefa77 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java
@@ -179,7 +179,7 @@ public class Storage {
 
         for (File f : ff) {
             if (f.length() > 0) {
-                String[] ee = context.getResources().getStringArray(R.array.encodings_values);
+                String[] ee = Factory.getEncodingValues(context);
                 String n = f.getName().toLowerCase();
                 for (String e : ee) {
                     if (n.endsWith("." + e))
diff --git a/app/src/main/java/com/github/axet/audiorecorder/encoders/Factory.java b/app/src/main/java/com/github/axet/audiorecorder/encoders/Factory.java
index 545562c..86746b8 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/encoders/Factory.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/encoders/Factory.java
@@ -19,6 +19,7 @@ public class Factory {
         if (Build.VERSION.SDK_INT >= 18)
             ll.add(".m4a");
         ll.add(".mka");
+        ll.add(".ogg");
         return ll.toArray(new String[]{});
     }
 
@@ -28,6 +29,7 @@ public class Factory {
         if (Build.VERSION.SDK_INT >= 18)
             ll.add("m4a");
         ll.add("mka");
+        ll.add("ogg");
         return ll.toArray(new String[]{});
     }
 
@@ -35,12 +37,12 @@ public class Factory {
         if (ext.equals("wav")) {
             return new FormatWAV(info, out);
         }
-        if (ext.equals("m4a")) {
-            return new FormatM4A(info, out);
-        }
         if (ext.equals("3gp")) {
             return new Format3GP(info, out);
         }
+        if (ext.equals("m4a")) {
+            return new FormatM4A(info, out);
+        }
         if (ext.equals("mka")) {
             return new FormatMKA(info, out);
         }
diff --git a/app/src/main/java/com/github/axet/audiorecorder/encoders/FormatMKA.java b/app/src/main/java/com/github/axet/audiorecorder/encoders/FormatMKA.java
index 565a438..7d4c2c1 100755
--- a/app/src/main/java/com/github/axet/audiorecorder/encoders/FormatMKA.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/encoders/FormatMKA.java
@@ -90,6 +90,8 @@ public class FormatMKA implements Encoder {
         return clone;
     }
 
+    public static final int BUFFER_FLAG_KEY_FRAME = 1; // MediaCodec.BUFFER_FLAG_KEY_FRAME
+
     boolean encode() {
         MediaCodec.BufferInfo outputInfo = new MediaCodec.BufferInfo();
         int outputIndex = encoder.dequeueOutputBuffer(outputInfo, 0);
@@ -125,7 +127,7 @@ public class FormatMKA implements Encoder {
                 encoder.releaseOutputBuffer(outputIndex, false);
             } else {
                 MatroskaFileFrame frame = new MatroskaFileFrame();
-                frame.setKeyFrame((outputInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) == MediaCodec.BUFFER_FLAG_KEY_FRAME);
+                frame.setKeyFrame((outputInfo.flags & BUFFER_FLAG_KEY_FRAME) == BUFFER_FLAG_KEY_FRAME);
                 frame.setTimecode(outputInfo.presentationTimeUs / 1000);
                 frame.setTrackNo(track.getTrackNo());
                 frame.setData(clone(output));