From e2e00a98d59330bbf5da308640b8f5f9332784a4 Mon Sep 17 00:00:00 2001
From: Denny <denny@denny-desktop>
Date: Tue, 24 Jan 2017 21:14:16 -0500
Subject: [PATCH] 135 WIP - updates to resolve issue with all audio being
 recorded, even when user has not elected to record the audio.

---
 src/channel/metadata/Metadata.java              | 17 +++++++++--------
 src/channel/metadata/MutableMetadata.java       |  2 ++
 .../channel/ChannelProcessingManager.java       | 14 +++++---------
 .../audio/DemodulatedAudioFilterModule.java     |  7 +++++--
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/channel/metadata/Metadata.java b/src/channel/metadata/Metadata.java
index 915f3288..bd00e5ad 100644
--- a/src/channel/metadata/Metadata.java
+++ b/src/channel/metadata/Metadata.java
@@ -55,7 +55,8 @@ public class Metadata
 
     //Lazily constructed member variables.
     private Integer mAudioPriority;
-    protected Boolean mRecordable;
+    protected Boolean mRecordable = false;
+    protected Boolean mDoNotRecord;
     private List<BroadcastChannel> mBroadcastChannels;
 
 
@@ -141,12 +142,12 @@ public class Metadata
      */
     public boolean isRecordable()
     {
-        if(mRecordable == null)
+        if(mDoNotRecord == null)
         {
             determineRecordable();
         }
 
-        return mRecordable;
+        return mRecordable & !mDoNotRecord;
     }
 
     /**
@@ -545,29 +546,29 @@ public class Metadata
      */
     private void determineRecordable()
     {
-        mRecordable = true;
+        mDoNotRecord = false;
 
         if(mPrimaryAddressTo.hasAlias() && !mPrimaryAddressTo.getAlias().isRecordable())
         {
-            mRecordable = false;
+            mDoNotRecord = true;
             return;
         }
 
         if(mPrimaryAddressFrom.hasAlias() && !mPrimaryAddressFrom.getAlias().isRecordable())
         {
-            mRecordable = false;
+            mDoNotRecord = true;
             return;
         }
 
         if(mSecondaryAddressTo.hasAlias() && !mSecondaryAddressTo.getAlias().isRecordable())
         {
-            mRecordable = false;
+            mDoNotRecord = true;
             return;
         }
 
         if(mSecondaryAddressFrom.hasAlias() && !mSecondaryAddressFrom.getAlias().isRecordable())
         {
-            mRecordable = false;
+            mDoNotRecord = true;
             return;
         }
     }
diff --git a/src/channel/metadata/MutableMetadata.java b/src/channel/metadata/MutableMetadata.java
index c0279a0d..10ee7b96 100644
--- a/src/channel/metadata/MutableMetadata.java
+++ b/src/channel/metadata/MutableMetadata.java
@@ -163,6 +163,8 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
      */
     public void resetTemporalAttributes()
     {
+        mDoNotRecord = null;
+
         if(hasMessage())
         {
             mMessage = null;
diff --git a/src/controller/channel/ChannelProcessingManager.java b/src/controller/channel/ChannelProcessingManager.java
index 1f12ac7a..2d7e8981 100644
--- a/src/controller/channel/ChannelProcessingManager.java
+++ b/src/controller/channel/ChannelProcessingManager.java
@@ -217,15 +217,11 @@ public class ChannelProcessingManager implements ChannelEventListener
             MessageActivityModel messageModel = new MessageActivityModel(messageFilter);
             processingChain.setMessageActivityModel(messageModel);
 
-            //Set the recordable flag to false in metadata if we don't have a record configuration, or if the user
-            //has not specified audio recording.  Note: the metadata class sets recordable to true by default if no
-            //setting has been specified.  This flag is subsequently turned off if any of the primary or secondary
-            //identifiers are designated as non-recordable.
-            if(channel.getRecordConfiguration() == null ||
-               !channel.getRecordConfiguration().getRecorders().contains(RecorderType.AUDIO))
-            {
-                processingChain.getChannelState().getMutableMetadata().setRecordable(false);
-            }
+            //Set the recordable flag to true if the user has requested recording.  The metadata class can still
+            //override recordability if any of the aliased values has 'Do Not Record' alias identifier.
+            processingChain.getChannelState().getMutableMetadata()
+                .setRecordable(channel.getRecordConfiguration() != null &&
+                    channel.getRecordConfiguration().getRecorders().contains(RecorderType.AUDIO));
 
             //Inject channel metadata that will be inserted into audio packets for recorder manager and streaming
             processingChain.getChannelState().getMutableMetadata().receive(
diff --git a/src/module/demodulate/audio/DemodulatedAudioFilterModule.java b/src/module/demodulate/audio/DemodulatedAudioFilterModule.java
index 532786ce..4efb3d8b 100644
--- a/src/module/demodulate/audio/DemodulatedAudioFilterModule.java
+++ b/src/module/demodulate/audio/DemodulatedAudioFilterModule.java
@@ -72,8 +72,11 @@ public class DemodulatedAudioFilterModule extends Module implements IUnFilteredR
         mBandPassFilter.dispose();
         mBandPassFilter = null;
 
-        mDCFilter.dispose();
-        mDCFilter = null;
+        if(mDCFilter != null)
+        {
+            mDCFilter.dispose();
+            mDCFilter = null;
+        }
     }
 
     @Override