From 4de76b7395cee235cd4f537ec295b3c9bdc2ba50 Mon Sep 17 00:00:00 2001
From: Andrew Comminos <andrew@comminos.com>
Date: Tue, 20 Sep 2016 01:10:10 -0700
Subject: Consolidate record thread shutdown.

---
 src/main/java/com/morlunk/jumble/audio/AudioInput.java | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/main/java/com/morlunk')

diff --git a/src/main/java/com/morlunk/jumble/audio/AudioInput.java b/src/main/java/com/morlunk/jumble/audio/AudioInput.java
index 7a6da29..5fc9609 100644
--- a/src/main/java/com/morlunk/jumble/audio/AudioInput.java
+++ b/src/main/java/com/morlunk/jumble/audio/AudioInput.java
@@ -109,6 +109,7 @@ public class AudioInput implements Runnable {
         if(!mRecording) return;
         mRecording = false;
         try {
+            mRecordThread.interrupt();
             mRecordThread.join();
             mRecordThread = null;
         } catch (InterruptedException e) {
@@ -122,19 +123,7 @@ public class AudioInput implements Runnable {
      * NOTE: It is not safe to call startRecording after.
      */
     public void shutdown() {
-        if(mRecording) {
-            mRecording = false;
-            try {
-                // Interrupt so that we stop waiting on the PTT CV.
-                mRecordThread.interrupt();
-                mRecordThread.join();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-        mRecordThread = null;
-
+        stopRecording();
         if(mAudioRecord != null) {
             mAudioRecord.release();
             mAudioRecord = null;
-- 
cgit v1.2.3