Updates build to 0.3.0 Beta 14

260 - Icecast and Shoutcast streaming doesn't auto-reconnect

build/build.xml

@@ -7,7 +7,7 @@
   <property name="major" value="0"/>
   <property name="minor" value="3"/>
   <property name="patch" value="0"/>
-  <property name="release" value="-beta8"/>
+  <property name="release" value="-beta14"/>
   <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/>
     
   <!-- Build properties -->

src/audio/AudioChannelPanel.java

@@ -90,7 +90,8 @@ public class AudioChannelPanel extends JPanel
 
     private void init()
     {
-        setLayout(new MigLayout("align center center, insets 0 0 0 0", "[][][align right]0[grow,fill]", ""));
+        setLayout(new MigLayout("align center center, insets 0 0 0 0",
+            "[][][align right]0[grow,fill]", ""));
         setBackground(mBackgroundColor);
 
         mMutedLabel.setFont(mFont);
@@ -109,7 +110,7 @@ public class AudioChannelPanel extends JPanel
 
         mTo.setFont(mFont);
         mTo.setForeground(mValueColor);
-        add(mTo);
+        add(mTo,"wmin 10lp");
     }
 
     @Override
@@ -159,30 +160,40 @@ public class AudioChannelPanel extends JPanel
      * does not occur on the Swing event thread -- wrap any calls to this
      * method with an event thread call.
      */
-    private void updateLabel(JLabel valueLabel, String value, JLabel aliasLabel, Alias alias)
+    private void updateLabel(JLabel textLabel, String value, JLabel iconLabel, Alias alias)
     {
         if(value != null)
         {
 
             if(alias != null)
             {
-                valueLabel.setText(alias.getName());
-                aliasLabel.setIcon(mIconManager.getIcon(alias.getIconName(), 18));
+                iconLabel.setIcon(mIconManager.getIcon(alias.getIconName(), 18));
+
+                String aliasName = alias.getName();
+
+                //Truncate label if length exceeds 33 characters - hack!
+                if(aliasName.length() > 33)
+                {
+                    textLabel.setText(aliasName.substring(0,30) + "...");
+                }
+                else
+                {
+                    textLabel.setText(aliasName);
+                }
             }
             else
             {
-                valueLabel.setText(value);
-                aliasLabel.setIcon(null);
+                iconLabel.setIcon(null);
+                textLabel.setText(value);
             }
         }
         else
         {
-            valueLabel.setText("-----");
-            aliasLabel.setIcon(null);
+            iconLabel.setIcon(null);
+            textLabel.setText("-----");
         }
     }
 
-
     /**
      * Processes audio metadata to update this panel's display values
      */

src/audio/AudioChannelsPanel.java

@@ -33,8 +33,7 @@ public class AudioChannelsPanel extends JPanel
 
     public AudioChannelsPanel(IconManager iconManager, SettingsManager settingsManager, IAudioController controller)
     {
-//        setLayout(new MigLayout("insets 0 0 0 0", "[][grow,fill][][grow,fill]", "[grow,fill]"));
-        setLayout(new MigLayout("insets 0 0 0 0", "[][sg,grow,fill][][sg,grow,fill]", "[grow,fill]"));
+        setLayout(new MigLayout("insets 0 0 0 0", "[][sg abc,grow,fill][][sg abc,grow,fill]", "[grow,fill]"));
 
         setBackground(Color.BLACK);
 
@@ -44,7 +43,7 @@ public class AudioChannelsPanel extends JPanel
 
         for(int x = 0; x < outputs.size(); x++)
         {
-            add(new AudioChannelPanel(iconManager, settingsManager, outputs.get(x)), "growx");
+            add(new AudioChannelPanel(iconManager, settingsManager, outputs.get(x)));
 
             if(x < outputs.size() - 1)
             {

src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java

@@ -36,6 +36,7 @@ import util.ThreadPool;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
+import java.nio.channels.UnresolvedAddressException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -44,7 +45,8 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
     private final static Logger mLog = LoggerFactory.getLogger(IcecastTCPAudioBroadcaster.class);
     private final static String TERMINATOR = "\r\n";
     private final static String SEPARATOR = ":";
-    private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
+    private static final long RECONNECT_INTERVAL_MILLISECONDS = 3000; //3 seconds
+    private static final long CONNECTION_ATTEMPT_TIMEOUT = 5000; //5 seconds
 
     private NioSocketConnector mSocketConnector;
     private IoSession mStreamingSession = null;
@@ -99,10 +101,11 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
             if(mSocketConnector == null)
             {
                 mSocketConnector = new NioSocketConnector();
-                mSocketConnector.setConnectTimeoutCheckInterval(10000);
+                mSocketConnector.setConnectTimeoutCheckInterval(CONNECTION_ATTEMPT_TIMEOUT);
 
-//                mSocketConnector.getFilterChain().addLast("logger",
-//                    new LoggingFilter(IcecastTCPAudioBroadcaster.class));
+//                LoggingFilter loggingFilter = new LoggingFilter(IcecastTCPAudioBroadcaster.class);
+//                loggingFilter.setMessageSentLogLevel(LogLevel.NONE);
+//                mSocketConnector.getFilterChain().addLast("logger", loggingFilter);
 
                 mSocketConnector.getFilterChain().addLast("codec",
                     new ProtocolCodecFilter(new IcecastCodecFactory()));
@@ -123,9 +126,20 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                         ConnectFuture future = mSocketConnector
                             .connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
                                 getBroadcastConfiguration().getPort()));
-                        future.awaitUninterruptibly();
+
+                        boolean connected = future.await(CONNECTION_ATTEMPT_TIMEOUT, TimeUnit.MILLISECONDS);
+
                         mStreamingSession = future.getSession();
                     }
+                    catch(UnresolvedAddressException uae)
+                    {
+                        //What do you do with this?  Nothing.
+                    }
+                    catch(InterruptedException ie)
+                    {
+                        //We couldn't connect within the timeout period -- disconnect so that we can try again later
+                        disconnect();
+                    }
                     catch(RuntimeIoException rie)
                     {
                         Throwable throwableCause = rie.getCause();
@@ -137,16 +151,20 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                         else if(throwableCause != null)
                         {
                             setBroadcastState(BroadcastState.ERROR);
-                            mLog.debug("Failed to connect", rie);
+                            mLog.debug("[" + getStreamName() + "] failed to connect", rie);
                         }
                         else
                         {
                             setBroadcastState(BroadcastState.ERROR);
-                            mLog.debug("Failed to connect - no exception is available");
+                            mLog.debug("[" + getStreamName() + "] failed to connect - no exception is available");
                         }
 
                         disconnect();
                     }
+                    catch(Throwable t)
+                    {
+                        disconnect();
+                    }
 
                     mConnecting.set(false);
                 }
@@ -164,12 +182,13 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
      */
     public void disconnect()
     {
-        if(connected())
+        if(connected() && mStreamingSession != null)
         {
-            if(mStreamingSession != null)
-            {
-                mStreamingSession.closeNow();
-            }
+            mStreamingSession.closeNow();
+        }
+        else
+        {
+            mLastConnectionAttempt = System.currentTimeMillis();
         }
     }
 
@@ -226,17 +245,18 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
         @Override
         public void sessionClosed(IoSession session) throws Exception
         {
+            mLastConnectionAttempt = System.currentTimeMillis();
+
             //If there is already an error state, don't override it.  Otherwise, set state to disconnected
             if(!getBroadcastState().isErrorState())
             {
                 setBroadcastState(BroadcastState.DISCONNECTED);
             }
 
-            mSocketConnector.dispose();
             mStreamingSession = null;
-            mSocketConnector = null;
 
             mConnecting.set(false);
+
             super.sessionClosed(session);
         }
 
@@ -253,45 +273,36 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
 
                     if(connected())
                     {
-                        mLog.info("Streaming connection error detected - resetting connection - " + reason);
                         disconnect();
-                        connect();
                     }
                     else if(reason.startsWith("Connection reset"))
                     {
-                        mLog.info("Streaming connection reset by remote server - reestablishing connection");
                         disconnect();
-                        connect();
                     }
                     else if(reason.startsWith("Operation timed out"))
                     {
-                        mLog.info("Streaming connection timed out - resetting connection");
                         disconnect();
-                        connect();
                     }
                     else
                     {
                         setBroadcastState(BroadcastState.ERROR);
                         disconnect();
-                        mLog.error("Unrecognized IO error: " + reason + ". Streaming halted.", cause);
                     }
                 }
                 else if(ioe instanceof WriteTimeoutException)
                 {
-                    mLog.info("Network write timeout error - resetting connection");
                     disconnect();
-                    connect();
                 }
                 else
                 {
                     setBroadcastState(BroadcastState.ERROR);
                     disconnect();
-                    mLog.error("Unspecified IO error - streaming halted.", cause);
+                    mLog.error("[" + getStreamName() + "] Unspecified IO error - streaming halted.", cause);
                 }
             }
             else
             {
-                mLog.error("Broadcast error", cause);
+                mLog.error("[" + getStreamName() + "] Broadcast error", cause);
                 setBroadcastState(BroadcastState.ERROR);
                 disconnect();
             }
@@ -319,6 +330,10 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                     {
                         setBroadcastState(BroadcastState.INVALID_CREDENTIALS);
                     }
+                    else if(message.contains("HTTP/1.1 501"))
+                    {
+                        disconnect(); //So that we can reconnect later
+                    }
                     else
                     {
                         mLog.error("Unrecognized server response:" + message);
@@ -328,7 +343,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
             }
             else
             {
-                mLog.error("Icecast TCP broadcaster - unrecognized message [ " + object.getClass() +
+                mLog.error("[" + getStreamName() + "]Icecast TCP broadcaster - unrecognized message [ " + object.getClass() +
                     "] received:" + object.toString());
             }
         }

src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java

@@ -168,6 +168,10 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
 
                         disconnect();
                     }
+                    catch(Throwable t)
+                    {
+                        disconnect();
+                    }
 
                     mConnecting.set(false);
                 }
@@ -185,12 +189,13 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
      */
     public void disconnect()
     {
-        if(connected())
+        if(connected() && mStreamingSession != null)
         {
-            if(mStreamingSession != null)
-            {
-                mStreamingSession.closeNow();
-            }
+            mStreamingSession.closeNow();
+        }
+        else
+        {
+            mLastConnectionAttempt = System.currentTimeMillis();
         }
     }
 
@@ -226,15 +231,15 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
         @Override
         public void sessionClosed(IoSession session) throws Exception
         {
+            mLastConnectionAttempt = System.currentTimeMillis();
+
             //If there is already an error state, don't override it.  Otherwise, set state to disconnected
             if(!getBroadcastState().isErrorState())
             {
                 setBroadcastState(BroadcastState.DISCONNECTED);
             }
 
-            mSocketConnector.dispose();
             mStreamingSession = null;
-            mSocketConnector = null;
 
             mConnecting.set(false);
             super.sessionClosed(session);
@@ -255,13 +260,11 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
                     {
                         mLog.info("Streaming connection reset by remote server - reestablishing connection");
                         disconnect();
-                        connect();
                     }
                     else if(reason.startsWith("Operation timed out"))
                     {
                         mLog.info("Streaming connection timed out - resetting connection");
                         disconnect();
-                        connect();
                     }
                     else
                     {

src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java

@@ -204,6 +204,10 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
 
                         disconnect();
                     }
+                    catch(Throwable t)
+                    {
+                        disconnect();
+                    }
 
                     mConnecting.set(false);
                 }
@@ -221,13 +225,13 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
      */
     public void disconnect()
     {
-        if(connected())
+        if(connected() && mStreamingSession != null)
         {
-            if(mStreamingSession != null)
-            {
-                mStreamingSession.write(new TerminateBroadcast());
-                mStreamingSession.closeNow();
-            }
+            mStreamingSession.closeNow();
+        }
+        else
+        {
+            mLastConnectionAttempt = System.currentTimeMillis();
         }
     }
 
@@ -349,15 +353,15 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
         @Override
         public void sessionClosed(IoSession session) throws Exception
         {
+            mLastConnectionAttempt = System.currentTimeMillis();
+
             //If there is already an error state, don't override it.  Otherwise, set state to disconnected
             if(!getBroadcastState().isErrorState())
             {
                 setBroadcastState(BroadcastState.DISCONNECTED);
             }
 
-            mSocketConnector.dispose();
             mStreamingSession = null;
-            mSocketConnector = null;
 
             mConnecting.set(false);
             super.sessionClosed(session);
@@ -378,13 +382,11 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
                     {
                         mLog.info("Streaming connection reset by remote server - reestablishing connection");
                         disconnect();
-                        connect();
                     }
                     else if(reason.startsWith("Operation timed out"))
                     {
                         mLog.info("Streaming connection timed out - resetting connection");
                         disconnect();
-                        connect();
                     }
                     else
                     {

src/channel/heartbeat/Heartbeat.java

@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ ******************************************************************************/
+package channel.heartbeat;
+
+public class Heartbeat
+{
+    /**
+     * Periodic pulse that is broadcast to subscribing modules within the demodulating chain so that
+     * monitoring of state and other attributes can occur on the primary demodulation and decoding
+     * thread.
+     */
+    public Heartbeat()
+    {
+    }
+}

src/channel/heartbeat/IHeartbeatListener.java

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ ******************************************************************************/
+package channel.heartbeat;
+
+import sample.Listener;
+
+public interface IHeartbeatListener
+{
+    public Listener<Heartbeat> getHeartbeatListener();
+}

src/channel/heartbeat/IHeartbeatProvider.java

@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2017 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ ******************************************************************************/
+package channel.heartbeat;
+
+import sample.Listener;
+
+public interface IHeartbeatProvider
+{
+    public void setHeartbeatListener(Listener<Heartbeat> listener);
+
+    public void removeHeartbeatListener();
+}

src/channel/state/ChannelState.java

@@ -20,6 +20,8 @@ package channel.state;
 
 import audio.squelch.ISquelchStateProvider;
 import audio.squelch.SquelchState;
+import channel.heartbeat.Heartbeat;
+import channel.heartbeat.IHeartbeatListener;
 import channel.metadata.Attribute;
 import channel.metadata.AttributeChangeRequest;
 import channel.metadata.IAttributeChangeRequestListener;
@@ -39,16 +41,13 @@ import sample.real.IOverflowListener;
 import source.tuner.frequency.FrequencyChangeEvent;
 import source.tuner.frequency.IFrequencyChangeListener;
 
-import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
 
 import static source.tuner.frequency.FrequencyChangeEvent.Event.NOTIFICATION_FREQUENCY_CHANGE;
 
 public class ChannelState extends Module implements ICallEventProvider, IDecoderStateEventListener,
-    IDecoderStateEventProvider, IFrequencyChangeListener, ISquelchStateProvider, IAttributeChangeRequestListener,
-    IOverflowListener
+    IDecoderStateEventProvider, IFrequencyChangeListener, IHeartbeatListener, ISquelchStateProvider,
+    IAttributeChangeRequestListener, IOverflowListener
 {
     private final static Logger mLog = LoggerFactory.getLogger(ChannelState.class);
 
@@ -61,8 +60,7 @@ public class ChannelState extends Module implements ICallEventProvider, IDecoder
     private Listener<DecoderStateEvent> mDecoderStateListener;
     private Listener<SquelchState> mSquelchStateListener;
     private DecoderStateEventReceiver mDecoderStateEventReceiver = new DecoderStateEventReceiver();
-    private StateMonitor mStateMonitor = new StateMonitor();
-    private ScheduledFuture<?> mStateMonitorFuture;
+    private HeartbeatReceiver mHeartbeatReceiver = new HeartbeatReceiver();
     private ChannelType mChannelType;
     private TrafficChannelManager mTrafficChannelEndListener;
     private CallEvent mTrafficChannelCallEvent;
@@ -79,30 +77,21 @@ public class ChannelState extends Module implements ICallEventProvider, IDecoder
 
 
     /**
-     * Channel state tracks the overall state of all processing modules and decoders
-     * configured for the channel and provides squelch control and decoder state
-     * reset events.
+     * Channel state tracks the overall state of all processing modules and decoders configured for the channel and
+     * provides squelch control and decoder state reset events.
      *
-     * Uses a state enumeration that defines allowable channel state transitions in
-     * order to track a call or data decode event from start to finish.  Uses a
-     * timer to monitor for inactivity and to provide a FADE period that indicates
-     * to the user that the activity has stopped while continuing to provide details
-     * about the call, before the state is reset to IDLE.
-     *
-     * Since this class is multi-threaded between decoder events and the internal
-     * timer that monitors for inactivity, this class uses the mState object for
-     * thread synchronization.
+     * Uses a state enumeration that defines allowable channel state transitions in order to track a call or data decode
+     * event from start to finish.  Uses a timer to monitor for inactivity and to provide a FADE period that indicates
+     * to the user that the activity has stopped while continuing to provide details about the call, before the state is
+     * reset to IDLE.
      *
      * State Descriptions:
-     * IDLE		Normal state. No voice or data call activity
-     * CALL/DATA/ENCRYPTED/CONTROL
-     * Decoding states.
-     * FADE		The phase after a voice or data call when either an explicit
-     * call end has been received, or when no new signalling updates
-     * have been received, and the fade timer has expired.  This phase
-     * allows for gui updates to signal to the user that the call is
-     * ended, while continuing to display the call details for the user
-     * TEARDOWN	Indicates a traffic channel that will be torn down for reuse.
+     * IDLE:  Normal state. No voice or data call activity
+     * CALL/DATA/ENCRYPTED/CONTROL:  Decoding states.
+     * FADE:  The phase after a voice or data call when either an explicit call end has been received, or when no new
+     *     signalling updates have been received, and the fade timer has expired.  This phase allows for gui updates to
+     *     signal to the user that the call is ended, while continuing to display the call details for the user
+     * TEARDOWN:  Indicates a traffic channel that will be torn down for reuse.
      */
     public ChannelState(ChannelType channelType)
     {
@@ -137,23 +126,11 @@ public class ChannelState extends Module implements ICallEventProvider, IDecoder
     @Override
     public void start(ScheduledExecutorService executor)
     {
-        if(mStateMonitorFuture == null && mStateMonitor != null)
+        mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE, mState));
+
+        if(mTrafficChannelEndListener != null)
         {
-            mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE, mState));
-
-            if(mTrafficChannelEndListener != null)
-            {
-                setState(State.CALL);
-            }
-
-            try
-            {
-                mStateMonitorFuture = executor.scheduleAtFixedRate(mStateMonitor, 0, 20, TimeUnit.MILLISECONDS);
-            }
-            catch(RejectedExecutionException ree)
-            {
-                mLog.error("state monitor scheduled task rejected", ree);
-            }
+            setState(State.CALL);
         }
     }
 
@@ -162,16 +139,6 @@ public class ChannelState extends Module implements ICallEventProvider, IDecoder
     {
         mMutableMetadata.resetAllAttributes();
 
-        if(mStateMonitorFuture != null)
-        {
-            boolean success = mStateMonitorFuture.cancel(true);
-
-            if(!success)
-            {
-                mLog.error("Couldn't stop monitoring scheduled future");
-            }
-        }
-
         mTrafficChannelEndListener = null;
 
         if(mTrafficChannelCallEvent != null)
@@ -182,8 +149,6 @@ public class ChannelState extends Module implements ICallEventProvider, IDecoder
 
         mTrafficChannelCallEvent = null;
 
-        mStateMonitorFuture = null;
-
         mSquelchLocked = false;
     }
 
@@ -192,7 +157,6 @@ public class ChannelState extends Module implements ICallEventProvider, IDecoder
         mCallEventListener = null;
         mDecoderStateListener = null;
         mSquelchStateListener = null;
-        mStateMonitor = null;
     }
 
     @Override
@@ -312,70 +276,74 @@ public class ChannelState extends Module implements ICallEventProvider, IDecoder
     }
 
     /**
-     * Sets the channel state to the specified state, or updates the timeout
-     * values so that the state monitor will not change state.  Broadcasts a
-     * squelch event when the state changes and the audio squelch state should
-     * change.  Also broadcasts changed attribute and decoder state events so
-     * that external processes can maintain sync with this channel state.
+     * Sets the channel state to the specified state, or updates the timeout values so that the state monitor will not
+     * change state.  Broadcasts a squelch event when the state changes and the audio squelch state should change.  Also
+     * broadcasts changed attribute and decoder state events so that external processes can maintain sync with this
+     * channel state.
      */
     protected void setState(State state)
     {
-        synchronized(mState)
+        if(state == mState)
         {
-            if(state == mState)
+            if(State.CALL_STATES.contains(state))
             {
-                if(State.CALL_STATES.contains(state))
-                {
-                    updateFadeTimeout();
-                }
+                updateFadeTimeout();
             }
-            else if(state != mState && mState.canChangeTo(state))
+        }
+        else if(mState.canChangeTo(state))
+        {
+            switch(state)
             {
-                switch(state)
-                {
-                    case CONTROL:
-                        //Don't allow traffic channels to be control channels,
-                        //otherwise they can't transition to call tear down
-                        if(isStandardChannel())
-                        {
-                            broadcast(SquelchState.SQUELCH);
-                            updateFadeTimeout();
-                            mState = state;
-                        }
-                        break;
-                    case DATA:
-                    case ENCRYPTED:
+                case CONTROL:
+                    //Don't allow traffic channels to be control channels, otherwise they can't transition to teardown
+                    if(isStandardChannel())
+                    {
                         broadcast(SquelchState.SQUELCH);
                         updateFadeTimeout();
                         mState = state;
-                        break;
-                    case CALL:
-                        broadcast(SquelchState.UNSQUELCH);
-                        updateFadeTimeout();
-                        mState = state;
-                        break;
-                    case FADE:
-                        processFadeState();
-                        break;
-                    case IDLE:
-                        processIdleState();
-                        break;
-                    case TEARDOWN:
-                        processTeardownState();
-                        break;
-                    case RESET:
-                        mState = State.IDLE;
-                        break;
-                    default:
-                        break;
-                }
-
-                mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE,
-                    mSourceOverflow ? State.OVERFLOW : mState));
+                    }
+                    break;
+                case DATA:
+                case ENCRYPTED:
+                    broadcast(SquelchState.SQUELCH);
+                    updateFadeTimeout();
+                    mState = state;
+                    break;
+                case CALL:
+                    broadcast(SquelchState.UNSQUELCH);
+                    updateFadeTimeout();
+                    mState = state;
+                    break;
+                case FADE:
+                    processFadeState();
+                    break;
+                case IDLE:
+                    processIdleState();
+                    break;
+                case TEARDOWN:
+                    processTeardownState();
+                    break;
+                case RESET:
+                    mState = State.IDLE;
+                    break;
+                default:
+                    break;
             }
+
+            mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE,
+                mSourceOverflow ? State.OVERFLOW : mState));
         }
     }
 
+    /**
+     * Receiver inner class that implements the IHeartbeatListener interface to receive heartbeat messages.
+     */
+    @Override
+    public Listener<Heartbeat> getHeartbeatListener()
+    {
+        return mHeartbeatReceiver;
+    }
+
     /**
      * This method is invoked if the source buffer provider goes into overflow state.  Since this is an external state,
      * we use the mSourceOverflow variable to override the internal state reported to external listeners.
@@ -625,45 +593,41 @@ public class ChannelState extends Module implements ICallEventProvider, IDecoder
     }
 
     /**
-     * Monitors decoder state events to automatically transition the channel
-     * state to IDLE (standard channel) or to TEARDOWN (traffic channel) when
-     * decoding stops or the monitored channel returns to a no signal state.
+     * Processes periodic heartbeats received from the processing chain to perform state monitoring and cleanup
+     * functions.
      *
-     * Provides a FADE transition state to allow for momentary decoding dropouts
-     * and to allow the user access to call details for a fade period upon
-     * call end.
+     * Monitors decoder state events to automatically transition the channel state to IDLE (standard channel) or to
+     * TEARDOWN (traffic channel) when decoding stops or the monitored channel returns to a no signal state.
+     *
+     * Provides a FADE transition state to allow for momentary decoding dropouts and to allow the user access to call
+     * details for a fade period upon call end.
      */
-    public class StateMonitor implements Runnable
+    public class HeartbeatReceiver implements Listener<Heartbeat>
     {
         @Override
-        public void run()
+        public void receive(Heartbeat heartbeat)
         {
             try
             {
-                synchronized(mState)
+                if(State.CALL_STATES.contains(mState) && mFadeTimeout <= System.currentTimeMillis())
                 {
-                    if(State.CALL_STATES.contains(mState) &&
-                        mFadeTimeout <= System.currentTimeMillis())
+                    processFadeState();
+                }
+                else if(mState == State.FADE && mEndTimeout <= System.currentTimeMillis())
+                {
+                    if(isTrafficChannel())
                     {
-                        processFadeState();
+                        processTeardownState();
                     }
-                    else if(mState == State.FADE &&
-                        mEndTimeout <= System.currentTimeMillis())
+                    else
                     {
-                        if(isTrafficChannel())
-                        {
-                            processTeardownState();
-                        }
-                        else
-                        {
-                            processIdleState();
-                        }
+                        processIdleState();
                     }
                 }
             }
-            catch(Exception e)
+            catch(Throwable e)
             {
-                mLog.error("Exception thrown while state monitor is running " +
+                mLog.error("An error occurred while state monitor was running " +
                     "- state [" + getState() +
                     "] current [" + System.currentTimeMillis() +
                     "] mResetTimeout [" + mEndTimeout +

src/channel/traffic/TrafficChannelManager.java

@@ -63,13 +63,11 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
     private Listener<CallEvent> mCallEventListener;
 
     private ChannelModel mChannelModel;
-    private ChannelProcessingManager mChannelProcessingManager;
     private DecodeConfiguration mDecodeConfiguration;
     private RecordConfiguration mRecordConfiguration;
     private String mSystem;
     private String mSite;
     private String mAliasListName;
-    private CallEvent mPreviousDoNotMonitorCallEvent;
 
     /**
      * Monitors call events and allocates traffic decoder channels in response
@@ -77,7 +75,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
      * traffic channel allocations.
      *
      * @param channelModel containing channels currently in use
-     * @param channelProcessingManager
      * @param decodeConfiguration - decoder configuration to use for each
      * traffic channel allocation.
      * @param recordConfiguration - recording options for each traffic channel
@@ -88,7 +85,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
      * in the pool
      */
     public TrafficChannelManager(ChannelModel channelModel,
-                                 ChannelProcessingManager channelProcessingManager,
                                  DecodeConfiguration decodeConfiguration,
                                  RecordConfiguration recordConfiguration,
                                  String system,
@@ -97,7 +93,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
                                  int trafficChannelPoolSize)
     {
         mChannelModel = channelModel;
-        mChannelProcessingManager = channelProcessingManager;
         mDecodeConfiguration = decodeConfiguration;
         mRecordConfiguration = recordConfiguration;
         mSystem = system;
@@ -120,7 +115,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
 
         mCallEventListener = null;
         mDecodeConfiguration = null;
-        mPreviousDoNotMonitorCallEvent = null;
     }
 
     /**
@@ -197,21 +191,7 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
 
             long frequency = callEvent.getFrequency();
 
-			/* Check the from/to aliases for do not monitor priority */
-            if(isDoNotMonitor(callEvent))
-            {
-                callEvent.setCallEventType(CallEventType.CALL_DO_NOT_MONITOR);
-
-                if(isSameCallEvent(mPreviousDoNotMonitorCallEvent, callEvent))
-                {
-                    return;
-                }
-                else
-                {
-                    mPreviousDoNotMonitorCallEvent = callEvent;
-                }
-            }
-            else if(frequency > 0)
+            if(frequency > 0)
             {
                 Channel channel = getChannel(callEvent.getChannel(), new TunerChannel(Type.TRAFFIC,
                     frequency, mDecodeConfiguration.getDecoderType().getChannelBandwidth()));
@@ -330,31 +310,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
         return false;
     }
 
-    /**
-     * Checks for aliases that contain a do not follow/process priority.
-     *
-     * @param event
-     * @return - true if there is an alias that has a do not process alias id
-     */
-    private boolean isDoNotMonitor(CallEvent event)
-    {
-        Alias to = event.getToIDAlias();
-
-        if(to != null && to.hasCallPriority() && to.getCallPriority() == Priority.DO_NOT_MONITOR)
-        {
-            return true;
-        }
-
-        Alias from = event.getFromIDAlias();
-
-        if(from != null && from.hasCallPriority() && from.getCallPriority() == Priority.DO_NOT_MONITOR)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
     @Override
     public Listener<DecoderStateEvent> getDecoderStateListener()
     {

src/module/ProcessingChain.java

@@ -24,16 +24,17 @@ import audio.IAudioPacketProvider;
 import audio.squelch.ISquelchStateListener;
 import audio.squelch.ISquelchStateProvider;
 import audio.squelch.SquelchState;
+import channel.heartbeat.Heartbeat;
+import channel.heartbeat.IHeartbeatListener;
+import channel.heartbeat.IHeartbeatProvider;
 import channel.metadata.AttributeChangeRequest;
 import channel.metadata.IAttributeChangeRequestListener;
 import channel.metadata.IAttributeChangeRequestProvider;
 import channel.state.ChannelState;
 import channel.state.DecoderState;
 import channel.state.DecoderStateEvent;
-import channel.state.DecoderStateEvent.Event;
 import channel.state.IDecoderStateEventListener;
 import channel.state.IDecoderStateEventProvider;
-import channel.state.State;
 import controller.channel.Channel.ChannelType;
 import controller.channel.ChannelEvent;
 import controller.channel.IChannelEventListener;
@@ -63,8 +64,6 @@ import sample.real.RealBuffer;
 import source.ComplexSource;
 import source.RealSource;
 import source.Source;
-import source.SourceException;
-import source.tuner.TunerChannelSource;
 import source.tuner.frequency.FrequencyChangeEvent;
 import source.tuner.frequency.IFrequencyChangeListener;
 import source.tuner.frequency.IFrequencyChangeProvider;
@@ -103,6 +102,7 @@ public class ProcessingChain implements IChannelEventListener
     private Broadcaster<ComplexBuffer> mComplexBufferBroadcaster = new Broadcaster<>();
     private Broadcaster<DecoderStateEvent> mDecoderStateEventBroadcaster = new Broadcaster<>();
     private Broadcaster<FrequencyChangeEvent> mFrequencyChangeEventBroadcaster = new Broadcaster<>();
+    private Broadcaster<Heartbeat> mHeartbeatBroadcaster = new Broadcaster<>();
     private Broadcaster<Message> mMessageBroadcaster = new Broadcaster<>();
     private Broadcaster<RealBuffer> mFilteredRealBufferBroadcaster = new Broadcaster<>();
     private Broadcaster<RealBuffer> mUnFilteredRealBufferBroadcaster = new Broadcaster<>();
@@ -320,7 +320,18 @@ public class ProcessingChain implements IChannelEventListener
 
         if(module instanceof IFrequencyChangeListener)
         {
-            mFrequencyChangeEventBroadcaster.addListener(((IFrequencyChangeListener) module).getFrequencyChangeListener());
+            Listener<FrequencyChangeEvent> frequencyChangeEventListener =
+                ((IFrequencyChangeListener)module).getFrequencyChangeListener();
+
+            if(frequencyChangeEventListener != null)
+            {
+                mFrequencyChangeEventBroadcaster.addListener(frequencyChangeEventListener);
+            }
+        }
+
+        if(module instanceof IHeartbeatListener)
+        {
+            mHeartbeatBroadcaster.addListener(((IHeartbeatListener)module).getHeartbeatListener());
         }
 
         if(module instanceof IMessageListener)
@@ -385,6 +396,11 @@ public class ProcessingChain implements IChannelEventListener
             mFrequencyChangeEventBroadcaster.removeListener(((IFrequencyChangeListener) module).getFrequencyChangeListener());
         }
 
+        if(module instanceof IHeartbeatListener)
+        {
+            mHeartbeatBroadcaster.removeListener(((IHeartbeatListener)module).getHeartbeatListener());
+        }
+
         if(module instanceof IMessageListener)
         {
             mMessageBroadcaster.removeListener(((IMessageListener) module).getMessageListener());
@@ -442,6 +458,11 @@ public class ProcessingChain implements IChannelEventListener
             ((IFrequencyChangeProvider) module).setFrequencyChangeListener(mFrequencyChangeEventBroadcaster);
         }
 
+        if(module instanceof IHeartbeatProvider)
+        {
+            ((IHeartbeatProvider)module).setHeartbeatListener(mHeartbeatBroadcaster);
+        }
+
         if(module instanceof IMessageProvider)
         {
             ((IMessageProvider) module).setMessageListener(mMessageBroadcaster);
@@ -499,6 +520,11 @@ public class ProcessingChain implements IChannelEventListener
             ((IFrequencyChangeProvider) module).setFrequencyChangeListener(null);
         }
 
+        if(module instanceof IHeartbeatProvider)
+        {
+            ((IHeartbeatProvider)module).removeHeartbeatListener();
+        }
+
         if(module instanceof IMessageProvider)
         {
             ((IMessageProvider) module).setMessageListener(null);

src/module/decode/DecoderFactory.java

@@ -222,7 +222,7 @@ public class DecoderFactory
 
                 if(channelType == ChannelType.STANDARD)
                 {
-                    modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig,
+                    modules.add(new TrafficChannelManager(channelModel, decodeConfig,
                         channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(),
                         (aliasList != null ? aliasList.getName() : null), mptConfig.getTrafficChannelPoolSize()));
                 }
@@ -263,7 +263,7 @@ public class DecoderFactory
 
                 if(channelType == ChannelType.STANDARD)
                 {
-                    modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig,
+                    modules.add(new TrafficChannelManager(channelModel, decodeConfig,
                         channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(),
                         (aliasList != null ? aliasList.getName() : null), p25Config.getTrafficChannelPoolSize()));
                 }

src/module/decode/lj1200/LJ1200DecoderState.java

@@ -54,7 +54,7 @@ public class LJ1200DecoderState extends DecoderState
         super(aliasList);
 
         mAddressAttribute = new AliasedStringAttributeMonitor(Attribute.SECONDARY_ADDRESS_TO,
-            getAttributeChangeRequestListener(), getAliasList(), AliasIDType.LOJACK);
+            getAttributeChangeRequestListener(), getAliasList(), AliasIDType.SITE);
     }
 
     @Override

src/module/decode/p25/P25DecoderState.java

@@ -315,6 +315,8 @@ public class P25DecoderState extends DecoderState
      */
     public void registerCallEvent(P25CallEvent event)
     {
+        String channel = event.getChannel();
+
         if(mChannelCallMap.containsKey(event.getChannel()))
         {
             P25CallEvent previousEvent = mChannelCallMap.remove(event.getChannel());
@@ -419,7 +421,7 @@ public class P25DecoderState extends DecoderState
                 mCurrentCallEvent = new P25CallEvent.Builder(CallEventType.CALL)
                     .aliasList(getAliasList())
                     .channel(mCurrentChannel)
-                    .details((hdu.isEncrypted() ? "ENCRYPTED " : ""))
+                    .details((hdu.isEncryptedAudio() ? "ENCRYPTED " : ""))
                     .frequency(mCurrentChannelFrequency)
                     .to(to)
                     .build();
@@ -1105,7 +1107,7 @@ public class P25DecoderState extends DecoderState
                                 broadcast(new P25CallEvent.Builder(CallEventType.CALL_DETECT)
                                     .aliasList(getAliasList())
                                     .channel(gvcu.getChannelA())
-                                    .details((gvcu.isEncrypted() ? "ENCRYPTED" : ""))
+                                    .details((gvcu.isEncryptedLinkControlWord() ? "ENCRYPTED" : ""))
                                     .frequency(gvcu.getDownlinkFrequencyA())
                                     .to(userA)
                                     .build());
@@ -1120,7 +1122,7 @@ public class P25DecoderState extends DecoderState
                                 broadcast(new P25CallEvent.Builder(CallEventType.CALL_DETECT)
                                     .aliasList(getAliasList())
                                     .channel(gvcu.getChannelB())
-                                    .details((gvcu.isEncrypted() ? "ENCRYPTED" : ""))
+                                    .details((gvcu.isEncryptedLinkControlWord() ? "ENCRYPTED" : ""))
                                     .frequency(gvcu.getDownlinkFrequencyB())
                                     .to(userB)
                                     .build());
@@ -1149,7 +1151,7 @@ public class P25DecoderState extends DecoderState
                                 broadcast(new P25CallEvent.Builder(CallEventType.CALL_DETECT)
                                     .aliasList(getAliasList())
                                     .channel(gvcue.getTransmitChannel())
-                                    .details((gvcue.isEncrypted() ? "ENCRYPTED" : ""))
+                                    .details((gvcue.isEncryptedLinkControlWord() ? "ENCRYPTED" : ""))
                                     .frequency(gvcue.getDownlinkFrequency())
                                     .to(group)
                                     .build());
@@ -1185,7 +1187,7 @@ public class P25DecoderState extends DecoderState
                             if(mCurrentCallEvent.getDetails() == null)
                             {
                                 mCurrentCallEvent.setDetails(
-                                    (gvcuser.isEncrypted() ? "ENCRYPTED " : "") +
+                                    (gvcuser.isEncryptedLinkControlWord() ? "ENCRYPTED " : "") +
                                         (gvcuser.isEmergency() ? "EMERGENCY " : ""));
 
                                 broadcast(mCurrentCallEvent);
@@ -1397,7 +1399,7 @@ public class P25DecoderState extends DecoderState
                         if(mCurrentCallEvent.getDetails() == null)
                         {
                             mCurrentCallEvent.setDetails(
-                                (tivcu.isEncrypted() ? "ENCRYPTED " : "") +
+                                (tivcu.isEncryptedLinkControlWord() ? "ENCRYPTED " : "") +
                                     (tivcu.isEmergency() ? "EMERGENCY " : ""));
 
                             broadcast(mCurrentCallEvent);
@@ -1480,7 +1482,7 @@ public class P25DecoderState extends DecoderState
                         if(mCurrentCallEvent.getDetails() == null)
                         {
                             mCurrentCallEvent.setDetails(
-                                (uuvcu.isEncrypted() ? "ENCRYPTED " : "") +
+                                (uuvcu.isEncryptedLinkControlWord() ? "ENCRYPTED " : "") +
                                     (uuvcu.isEmergency() ? "EMERGENCY " : ""));
 
                             broadcast(mCurrentCallEvent);
@@ -1557,6 +1559,7 @@ public class P25DecoderState extends DecoderState
                     break;
                 case IDENTIFIER_UPDATE_NON_VUHF:
                 case IDENTIFIER_UPDATE_VHF_UHF_BANDS:
+                case IDENTIFIER_UPDATE_TDMA:
                     IdentifierUpdate iu = (IdentifierUpdate)tsbk;
 
                     if(!mBands.containsKey(iu.getIdentifier()))
@@ -1710,33 +1713,41 @@ public class P25DecoderState extends DecoderState
                         .build());
                     break;
                 case SNDCP_RF_CONFIRMED_DATA:
-                    SNDCPUserData sud = (SNDCPUserData)pduc;
-
-                    StringBuilder sbFrom = new StringBuilder();
-                    StringBuilder sbTo = new StringBuilder();
-
-                    sbFrom.append(sud.getSourceIPAddress());
-                    sbTo.append(sud.getDestinationIPAddress());
-
-                    if(sud.getIPProtocol() == IPProtocol.UDP)
+                    if(pduc instanceof SNDCPUserData)
                     {
-                        sbFrom.append(":");
-                        sbFrom.append(sud.getUDPSourcePort());
-                        sbTo.append(":");
-                        sbTo.append(sud.getUDPDestinationPort());
+                        SNDCPUserData sud = (SNDCPUserData)pduc;
+
+                        StringBuilder sbFrom = new StringBuilder();
+                        StringBuilder sbTo = new StringBuilder();
+
+                        sbFrom.append(sud.getSourceIPAddress());
+                        sbTo.append(sud.getDestinationIPAddress());
+
+                        if(sud.getIPProtocol() == IPProtocol.UDP)
+                        {
+                            sbFrom.append(":");
+                            sbFrom.append(sud.getUDPSourcePort());
+                            sbTo.append(":");
+                            sbTo.append(sud.getUDPDestinationPort());
+                        }
+
+                        broadcast(new DecoderStateEvent(this, Event.START, State.DATA));
+
+                        broadcast(new P25CallEvent.Builder(CallEventType.DATA_CALL)
+                            .aliasList(getAliasList())
+                            .channel(mCurrentChannel)
+                            .details("DATA: " + sud.getPayload() +
+                                " RADIO IP:" + sbTo.toString())
+                            .frequency(mCurrentChannelFrequency)
+                            .from(sbFrom.toString())
+                            .to(pduc.getLogicalLinkID())
+                            .build());
+                    }
+                    else
+                    {
+                        mLog.error("Error - expected SNDCPUserData instance but class was: " + pduc.getClass() +
+                        " and PDU Type:" + pduc.getPDUType().name());
                     }
-
-                    broadcast(new DecoderStateEvent(this, Event.START, State.DATA));
-
-                    broadcast(new P25CallEvent.Builder(CallEventType.DATA_CALL)
-                        .aliasList(getAliasList())
-                        .channel(mCurrentChannel)
-                        .details("DATA: " + sud.getPayload() +
-                            " RADIO IP:" + sbTo.toString())
-                        .frequency(mCurrentChannelFrequency)
-                        .from(sbFrom.toString())
-                        .to(pduc.getLogicalLinkID())
-                        .build());
                     break;
                 case SNDCP_RF_UNCONFIRMED_DATA:
                     break;
@@ -2735,6 +2746,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(pgvcg.isTDMAChannel() ? "TDMA " : "");
                     details.append(pgvcg.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(pgvcg.getPriority());
                     details.append(pgvcg.isEncryptedChannel() ? " ENCRYPTED" : "");
@@ -2742,7 +2754,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (pgvcg.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(pgvcg.getDownlinkFrequency())
                         .from(from)
@@ -2775,8 +2787,9 @@ public class P25DecoderState extends DecoderState
                 {
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (gvcgu.isTDMAChannel1() ? " TDMA" : ""))
-                        .details((gvcgu.isEncrypted() ? "ENCRYPTED " : ""))
+                        .channel(channel)
+                        .details((gvcgu.isTDMAChannel1() ? "TDMA " : "") +
+                            (gvcgu.isEncrypted() ? "ENCRYPTED " : ""))
                         .frequency(gvcgu.getDownlinkFrequency1())
                         .to(to)
                         .build();
@@ -2801,8 +2814,9 @@ public class P25DecoderState extends DecoderState
                 {
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.PATCH_GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel2 + (gvcgu.isTDMAChannel2() ? " TDMA" : ""))
-                        .details((gvcgu.isEncrypted() ? "ENCRYPTED " : ""))
+                        .channel(channel2)
+                        .details((gvcgu.isTDMAChannel2() ? "TDMA " : "") +
+                                (gvcgu.isEncrypted() ? "ENCRYPTED " : ""))
                         .frequency(gvcgu.getDownlinkFrequency2())
                         .to(to2)
                         .build();
@@ -2866,6 +2880,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(gdcg.isTDMAChannel() ? "TDMA " : "");
                     details.append(gdcg.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(gdcg.getPriority()).append(" ");
                     details.append(gdcg.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -2873,7 +2888,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (gdcg.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(gdcg.getDownlinkFrequency())
                         .from(from)
@@ -2904,6 +2919,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(gvcg.isTDMAChannel() ? "TDMA " : "");
                     details.append(gvcg.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(gvcg.getPriority()).append(" ");
                     details.append(gvcg.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -2911,7 +2927,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (gvcg.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(gvcg.getDownlinkFrequency())
                         .from(from)
@@ -2928,8 +2944,7 @@ public class P25DecoderState extends DecoderState
                 }
                 break;
             case GROUP_VOICE_CHANNEL_GRANT_UPDATE:
-                GroupVoiceChannelGrantUpdate gvcgu =
-                    (GroupVoiceChannelGrantUpdate)message;
+                GroupVoiceChannelGrantUpdate gvcgu = (GroupVoiceChannelGrantUpdate)message;
 
                 channel = gvcgu.getChannel1();
                 from = null;
@@ -2942,6 +2957,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(gvcgu.isTDMAChannel() ? "TDMA " : "");
                     details.append(gvcgu.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(gvcgu.getPriority()).append(" ");
                     details.append(gvcgu.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -2949,7 +2965,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(gvcgu.getChannel1() + (gvcgu.isTDMAChannel1() ? " TDMA" : ""))
+                        .channel(gvcgu.getChannel1())
                         .details(details.toString())
                         .frequency(gvcgu.getDownlinkFrequency1())
                         .from(from)
@@ -2977,6 +2993,7 @@ public class P25DecoderState extends DecoderState
                     else
                     {
                         StringBuilder details = new StringBuilder();
+                        details.append(gvcgu.isTDMAChannel() ? "TDMA " : "");
                         details.append(gvcgu.isEmergency() ? "EMERGENCY " : "");
                         details.append("PRI:").append(gvcgu.getPriority()).append(" ");
                         details.append(gvcgu.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -2984,7 +3001,7 @@ public class P25DecoderState extends DecoderState
 
                         P25CallEvent event2 = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
                             .aliasList(getAliasList())
-                            .channel(gvcgu.getChannel2() + (gvcgu.isTDMAChannel2() ? " TDMA" : ""))
+                            .channel(gvcgu.getChannel2())
                             .details(details.toString())
                             .frequency(gvcgu.getDownlinkFrequency2())
                             .to(gvcgu.getGroupAddress2())
@@ -3016,6 +3033,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(gvcgue.isTDMAChannel() ? "TDMA " : "");
                     details.append(gvcgue.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(gvcgue.getPriority()).append(" ");
                     details.append(gvcgue.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -3023,7 +3041,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.GROUP_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (gvcgue.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(gvcgue.getDownlinkFrequency())
                         .from(from)
@@ -3053,6 +3071,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(idcg.isTDMAChannel() ? "TDMA " : "");
                     details.append(idcg.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(idcg.getPriority()).append(" ");
                     details.append(idcg.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -3060,7 +3079,7 @@ public class P25DecoderState extends DecoderState
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (idcg.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(idcg.getDownlinkFrequency())
                         .from(from)
@@ -3090,13 +3109,14 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(sdcg.isTDMAChannel() ? "TDMA " : "");
                     details.append(sdcg.isEmergency() ? "EMERGENCY " : "");
                     details.append(sdcg.isEncryptedChannel() ? "ENCRYPTED " : "");
                     details.append(sdcg.getSessionMode().name());
 
                     P25CallEvent event = new P25CallEvent.Builder(CallEventType.DATA_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (sdcg.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(sdcg.getDownlinkFrequency())
                         .from(from)
@@ -3128,6 +3148,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(tivcg.isTDMAChannel() ? "TDMA " : "");
                     details.append(tivcg.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(tivcg.getPriority()).append(" ");
                     details.append(tivcg.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -3137,7 +3158,7 @@ public class P25DecoderState extends DecoderState
                     P25CallEvent event = new P25CallEvent.Builder(
                         CallEventType.TELEPHONE_INTERCONNECT)
                         .aliasList(getAliasList())
-                        .channel(channel + (tivcg.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(tivcg.getDownlinkFrequency())
                         .from(from)
@@ -3170,6 +3191,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(tivcgu.isTDMAChannel() ? "TDMA " : "");
                     details.append(tivcgu.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(tivcgu.getPriority()).append(" ");
                     details.append(tivcgu.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -3179,7 +3201,7 @@ public class P25DecoderState extends DecoderState
                     P25CallEvent event = new P25CallEvent.Builder(
                         CallEventType.TELEPHONE_INTERCONNECT)
                         .aliasList(getAliasList())
-                        .channel(channel + (tivcgu.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(tivcgu.getDownlinkFrequency())
                         .from(from)
@@ -3209,6 +3231,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(uuvcg.isTDMAChannel() ? "TDMA " : "");
                     details.append(uuvcg.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(uuvcg.getPriority()).append(" ");
                     details.append(uuvcg.isEncryptedChannel() ? " ENCRYPTED " : "");
@@ -3217,7 +3240,7 @@ public class P25DecoderState extends DecoderState
                     P25CallEvent event = new P25CallEvent.Builder(
                         CallEventType.UNIT_TO_UNIT_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (uuvcg.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(uuvcg.getDownlinkFrequency())
                         .from(from)
@@ -3247,6 +3270,7 @@ public class P25DecoderState extends DecoderState
                 else
                 {
                     StringBuilder details = new StringBuilder();
+                    details.append(uuvcgu.isTDMAChannel() ? "TDMA " : "");
                     details.append(uuvcgu.isEmergency() ? "EMERGENCY " : "");
                     details.append("PRI:").append(uuvcgu.getPriority()).append(" ");
                     details.append(uuvcgu.isEncryptedChannel() ? "ENCRYPTED " : "");
@@ -3255,7 +3279,7 @@ public class P25DecoderState extends DecoderState
                     P25CallEvent event = new P25CallEvent.Builder(
                         CallEventType.UNIT_TO_UNIT_CALL)
                         .aliasList(getAliasList())
-                        .channel(channel + (uuvcgu.isTDMAChannel() ? " TDMA" : ""))
+                        .channel(channel)
                         .details(details.toString())
                         .frequency(uuvcgu.getDownlinkFrequency())
                         .from(from)

src/module/decode/p25/audio/P25AudioModule.java

@@ -12,6 +12,9 @@ import jmbe.iface.AudioConverter;
 import message.IMessageListener;
 import message.Message;
 import module.Module;
+import module.decode.p25.message.hdu.HDUMessage;
+import module.decode.p25.message.ldu.LDU1Message;
+import module.decode.p25.message.ldu.LDU2Message;
 import module.decode.p25.message.ldu.LDUMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,14 +28,18 @@ public class P25AudioModule extends Module implements Listener<Message>, IAudioP
     private final static Logger mLog = LoggerFactory.getLogger(P25AudioModule.class);
 
     private static final String IMBE_CODEC = "IMBE";
-
     private static boolean mLibraryLoadStatusLogged = false;
+
     private boolean mCanConvertAudio = false;
+    private boolean mEncryptedCall = false;
+    private boolean mEncryptedCallStateEstablished = false;
+
     private AudioConverter mAudioConverter;
     private Listener<AudioPacket> mAudioPacketListener;
     private SquelchStateListener mSquelchStateListener = new SquelchStateListener();
     private NonClippingGain mGain = new NonClippingGain(5.0f, 0.95f);
     private Metadata mMetadata;
+    private LDU1Message mCachedLDU1Message = null;
 
     public P25AudioModule(Metadata metadata)
     {
@@ -76,32 +83,73 @@ public class P25AudioModule extends Module implements Listener<Message>, IAudioP
     }
 
     /**
-     * Primary processing method for p25 imbe audio frame messages.  Each LDU
-     * audio message contains 9 imbe voice frames.  Each frame is converted to
-     * audio when the JMBE library is loaded, processed by auto-gain, and
-     * broadcast to the audio packet listener.
+     * Processes call header (HDU) and voice frame (LDU1/LDU2) messages to decode audio and to determine the
+     * encrypted audio status of a call event. Only the HDU and LDU2 messages convey encrypted call status. If an
+     * LDU1 message is received without a preceding HDU message, then the LDU1 message is cached until the first
+     * LDU2 message is received and the encryption state can be determined. Both the LDU1 and the LDU2 message are
+     * then processed for audio if the call is unencrypted.
      */
     public void receive(Message message)
     {
-        if (mCanConvertAudio && mAudioPacketListener != null)
+        if(mCanConvertAudio && mAudioPacketListener != null)
         {
-            if (message instanceof LDUMessage)
+            if(mEncryptedCallStateEstablished)
             {
-                LDUMessage ldu = (LDUMessage) message;
-
-				/* Only process unencrypted audio frames */
-                if (!(ldu.isValid() && ldu.isEncrypted()))
+                if(message instanceof LDUMessage)
                 {
-                    for (byte[] frame : ldu.getIMBEFrames())
-                    {
-                        float[] audio = mAudioConverter.decode(frame);
-
-                        audio = mGain.apply(audio);
-
-                        mAudioPacketListener.receive(new AudioPacket(audio, mMetadata.copyOf()));
-                    }
+                    processAudio((LDUMessage)message);
                 }
             }
+            else
+            {
+                if(message instanceof HDUMessage)
+                {
+                    mEncryptedCallStateEstablished = true;
+                    mEncryptedCall = ((HDUMessage)message).isEncryptedAudio();
+                }
+                else if(message instanceof LDU1Message)
+                {
+                    //When we receive an LDU1 message with first receiving the HDU message, cache the LDU1 Message
+                    //until we can determine the encrypted call state from the next LDU2 message
+                    mCachedLDU1Message = (LDU1Message)message;
+                }
+                else if(message instanceof LDU2Message)
+                {
+                    mEncryptedCallStateEstablished = true;
+                    LDU2Message ldu2 = (LDU2Message)message;
+                    mEncryptedCall = ldu2.isEncryptedAudio();
+
+                    if(mCachedLDU1Message != null)
+                    {
+                        processAudio(mCachedLDU1Message);
+                        mCachedLDU1Message = null;
+                    }
+
+                    processAudio(ldu2);
+                }
+            }
+        }
+    }
+
+    /**
+     * Processes an audio packet by decoding the IMBE audio frames and rebroadcasting them as PCM audio packets.
+     */
+    private void processAudio(LDUMessage ldu)
+    {
+        if(!mEncryptedCall)
+        {
+            for(byte[] frame : ldu.getIMBEFrames())
+            {
+                float[] audio = mAudioConverter.decode(frame);
+
+                audio = mGain.apply(audio);
+
+                mAudioPacketListener.receive(new AudioPacket(audio, mMetadata.copyOf()));
+            }
+        }
+        else
+        {
+            //Encrypted audio processing not implemented
         }
     }
 
@@ -119,18 +167,18 @@ public class P25AudioModule extends Module implements Listener<Message>, IAudioP
             @SuppressWarnings("rawtypes")
             Class temp = Class.forName("jmbe.JMBEAudioLibrary");
 
-            library = (AudioConversionLibrary) temp.newInstance();
+            library = (AudioConversionLibrary)temp.newInstance();
 
-            if ((library.getMajorVersion() == 0 && library.getMinorVersion() >= 3 &&
-                    library.getBuildVersion() >= 3) || library.getMajorVersion() >= 1)
+            if((library.getMajorVersion() == 0 && library.getMinorVersion() >= 3 &&
+                library.getBuildVersion() >= 3) || library.getMajorVersion() >= 1)
             {
                 mAudioConverter = library.getAudioConverter(IMBE_CODEC, AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO);
 
-                if (mAudioConverter != null)
+                if(mAudioConverter != null)
                 {
                     mCanConvertAudio = true;
 
-                    if (!mLibraryLoadStatusLogged)
+                    if(!mLibraryLoadStatusLogged)
                     {
                         StringBuilder sb = new StringBuilder();
                         sb.append("JMBE audio conversion library [");
@@ -144,7 +192,7 @@ public class P25AudioModule extends Module implements Listener<Message>, IAudioP
                 }
                 else
                 {
-                    if (!mLibraryLoadStatusLogged)
+                    if(!mLibraryLoadStatusLogged)
                     {
                         mLog.info("JMBE audio conversion library NOT FOUND");
                         mLibraryLoadStatusLogged = true;
@@ -156,28 +204,28 @@ public class P25AudioModule extends Module implements Listener<Message>, IAudioP
                 mLog.warn("JMBE library version 0.3.3 or higher is required - found: " + library.getVersion());
             }
         }
-        catch (ClassNotFoundException e1)
+        catch(ClassNotFoundException e1)
         {
-            if (!mLibraryLoadStatusLogged)
+            if(!mLibraryLoadStatusLogged)
             {
                 mLog.error("Couldn't find/load JMBE audio conversion library");
                 mLibraryLoadStatusLogged = true;
             }
         }
-        catch (InstantiationException e1)
+        catch(InstantiationException e1)
         {
-            if (!mLibraryLoadStatusLogged)
+            if(!mLibraryLoadStatusLogged)
             {
                 mLog.error("Couldn't instantiate JMBE audio conversion library class");
                 mLibraryLoadStatusLogged = true;
             }
         }
-        catch (IllegalAccessException e1)
+        catch(IllegalAccessException e1)
         {
-            if (!mLibraryLoadStatusLogged)
+            if(!mLibraryLoadStatusLogged)
             {
                 mLog.error("Couldn't load JMBE audio conversion library due to "
-                        + "security restrictions");
+                    + "security restrictions");
                 mLibraryLoadStatusLogged = true;
             }
         }
@@ -196,19 +244,25 @@ public class P25AudioModule extends Module implements Listener<Message>, IAudioP
     }
 
     /**
-     * Wrapper for squelch state listener.  Internally, the P25 audio module
-     * doesn't have a squelch state.  If there are IMBE audio frames, we have
-     * audio.  We use this listener to signal to the recorder manager that the
-     * channel state is resetting and it should end the recording.
+     * Wrapper for squelch state to process end of call actions.  At call end the encrypted call state established
+     * flag is reset so that the encrypted audio state for the next call can be properly detected and we send an
+     * END audio packet so that downstream processors like the audio recorder can properly close out a call sequence.
      */
     public class SquelchStateListener implements Listener<SquelchState>
     {
         @Override
         public void receive(SquelchState state)
         {
-            if (state == SquelchState.SQUELCH && mAudioPacketListener != null)
+            if(state == SquelchState.SQUELCH)
             {
-                mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf()));
+                if(mAudioPacketListener != null)
+                {
+                    mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf()));
+                }
+
+                mEncryptedCallStateEstablished = false;
+                mEncryptedCall = false;
+                mCachedLDU1Message = null;
             }
         }
     }

src/module/decode/p25/message/hdu/HDUMessage.java

@@ -245,7 +245,7 @@ public class HDUMessage extends P25Message
 		return Encryption.fromValue( mMessage.getInt( ALGORITHM_ID ) );
 	}
 	
-	public boolean isEncrypted()
+	public boolean isEncryptedAudio()
 	{
 		return getEncryption() != Encryption.UNENCRYPTED;
 	}

src/module/decode/p25/message/ldu/LDU1Message.java

@@ -1,244 +1,246 @@
 package module.decode.p25.message.ldu;
 
-import module.decode.p25.reference.DataUnitID;
-import module.decode.p25.reference.LinkControlOpcode;
-import module.decode.p25.reference.Vendor;
-import module.decode.p25.reference.VendorLinkControlOpcode;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import alias.AliasList;
 import bits.BinaryMessage;
 import edac.CRC;
 import edac.Hamming10;
 import edac.ReedSolomon_63_47_17;
+import module.decode.p25.reference.DataUnitID;
+import module.decode.p25.reference.LinkControlOpcode;
+import module.decode.p25.reference.Vendor;
+import module.decode.p25.reference.VendorLinkControlOpcode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LDU1Message extends LDUMessage
 {
-	private final static Logger mLog = LoggerFactory.getLogger( LDU1Message.class );
-	
-	public static final int ENCRYPTION_FLAG = 352;
-	public static final int IMPLICIT_VENDOR_FLAG = 353;
-	public static final int[] OPCODE = { 354,355,356,357,362,363 };
-	public static final int[] VENDOR = { 364,365,366,367,372,373,374,375 };
-	
-	public static final int[] GOLAY_WORD_STARTS = { 
-		352,362,372,382,536,546,556,566,720,730,740,750,904,914,924,934,1088,
-		1098,1108,1118,1272,1282,1292,1302 };
+    private final static Logger mLog = LoggerFactory.getLogger(LDU1Message.class);
 
-	public static final int[] CW_HEX_0 = { 352,353,354,355,356,357 };
-	public static final int[] CW_HEX_1 = { 362,363,364,365,366,367 };
-	public static final int[] CW_HEX_2 = { 372,373,374,375,376,377 };
-	public static final int[] CW_HEX_3 = { 382,383,384,385,386,387 };
-	public static final int[] CW_HEX_4 = { 536,537,538,539,540,541 };
-	public static final int[] CW_HEX_5 = { 546,547,548,549,550,551 };
-	public static final int[] CW_HEX_6 = { 556,557,558,559,560,561 };
-	public static final int[] CW_HEX_7 = { 566,567,568,569,570,571 };
-	public static final int[] CW_HEX_8 = { 720,721,722,723,724,725 };
-	public static final int[] CW_HEX_9 = { 730,731,732,733,734,735 };
-	public static final int[] CW_HEX_10 = { 740,741,742,743,744,745 };
-	public static final int[] CW_HEX_11 = { 750,751,752,753,754,755 };
-	public static final int[] RS_HEX_0 = { 904,905,906,907,908,909 };
-	public static final int[] RS_HEX_1 = { 914,915,916,917,918,919 };
-	public static final int[] RS_HEX_2 = { 924,925,926,927,928,929 };
-	public static final int[] RS_HEX_3 = { 934,935,936,937,938,939 };
-	public static final int[] RS_HEX_4 = { 1088,1089,1090,1091,1092,1093 };
-	public static final int[] RS_HEX_5 = { 1098,1099,1100,1101,1102,1103 };
-	public static final int[] RS_HEX_6 = { 1108,1109,1110,1111,1112,1113 };
-	public static final int[] RS_HEX_7 = { 1118,1119,1120,1121,1122,1123 };
-	public static final int[] RS_HEX_8 = { 1272,1273,1274,1275,1276,1277 };
-	public static final int[] RS_HEX_9 = { 1282,1283,1284,1285,1286,1287 };
-	public static final int[] RS_HEX_10 = { 1292,1293,1294,1295,1296,1297 };
-	public static final int[] RS_HEX_11 = { 1302,1303,1304,1305,1306,1307 };
+    public static final int ENCRYPTED_LINK_CONTROL_WORD_FLAG = 352;
+    public static final int IMPLICIT_VENDOR_FLAG = 353;
+    public static final int[] OPCODE = {354, 355, 356, 357, 362, 363};
+    public static final int[] VENDOR = {364, 365, 366, 367, 372, 373, 374, 375};
 
-	/* Reed-Solomon(24,12,13) code protects the link control word.  Maximum
-	 * correctable errors are: Hamming Distance(13) / 2 = 6  */
-	public static final ReedSolomon_63_47_17 mReedSolomonDecoder = 
-			new ReedSolomon_63_47_17( 6 );
+    public static final int[] GOLAY_WORD_STARTS = {
+        352, 362, 372, 382, 536, 546, 556, 566, 720, 730, 740, 750, 904, 914, 924, 934, 1088,
+        1098, 1108, 1118, 1272, 1282, 1292, 1302};
 
-	public LDU1Message( BinaryMessage message, DataUnitID duid,
-            AliasList aliasList )
+    public static final int[] CW_HEX_0 = {352, 353, 354, 355, 356, 357};
+    public static final int[] CW_HEX_1 = {362, 363, 364, 365, 366, 367};
+    public static final int[] CW_HEX_2 = {372, 373, 374, 375, 376, 377};
+    public static final int[] CW_HEX_3 = {382, 383, 384, 385, 386, 387};
+    public static final int[] CW_HEX_4 = {536, 537, 538, 539, 540, 541};
+    public static final int[] CW_HEX_5 = {546, 547, 548, 549, 550, 551};
+    public static final int[] CW_HEX_6 = {556, 557, 558, 559, 560, 561};
+    public static final int[] CW_HEX_7 = {566, 567, 568, 569, 570, 571};
+    public static final int[] CW_HEX_8 = {720, 721, 722, 723, 724, 725};
+    public static final int[] CW_HEX_9 = {730, 731, 732, 733, 734, 735};
+    public static final int[] CW_HEX_10 = {740, 741, 742, 743, 744, 745};
+    public static final int[] CW_HEX_11 = {750, 751, 752, 753, 754, 755};
+    public static final int[] RS_HEX_0 = {904, 905, 906, 907, 908, 909};
+    public static final int[] RS_HEX_1 = {914, 915, 916, 917, 918, 919};
+    public static final int[] RS_HEX_2 = {924, 925, 926, 927, 928, 929};
+    public static final int[] RS_HEX_3 = {934, 935, 936, 937, 938, 939};
+    public static final int[] RS_HEX_4 = {1088, 1089, 1090, 1091, 1092, 1093};
+    public static final int[] RS_HEX_5 = {1098, 1099, 1100, 1101, 1102, 1103};
+    public static final int[] RS_HEX_6 = {1108, 1109, 1110, 1111, 1112, 1113};
+    public static final int[] RS_HEX_7 = {1118, 1119, 1120, 1121, 1122, 1123};
+    public static final int[] RS_HEX_8 = {1272, 1273, 1274, 1275, 1276, 1277};
+    public static final int[] RS_HEX_9 = {1282, 1283, 1284, 1285, 1286, 1287};
+    public static final int[] RS_HEX_10 = {1292, 1293, 1294, 1295, 1296, 1297};
+    public static final int[] RS_HEX_11 = {1302, 1303, 1304, 1305, 1306, 1307};
+
+    /* Reed-Solomon(24,12,13) code protects the link control word.  Maximum
+     * correctable errors are: Hamming Distance(13) / 2 = 6  */
+    public static final ReedSolomon_63_47_17 mReedSolomonDecoder =
+        new ReedSolomon_63_47_17(6);
+
+    public LDU1Message(BinaryMessage message, DataUnitID duid,
+                       AliasList aliasList)
     {
-	    super( message, duid, aliasList );
+        super(message, duid, aliasList);
 
 	    
 	    /* NID CRC is checked in the message framer, thus a constructed message
-	     * means it passed the CRC */
-	    mCRC = new CRC[ 3 ];
-	    mCRC[ 0 ] = CRC.PASSED;
-	    
-	    checkCRC();
-    }
-	
-	/**
-	 * Subclass constructor from an existing LDU1Message
-	 */
-	protected LDU1Message( LDU1Message message )
-	{
-		super( message.getSourceMessage(), DataUnitID.LDU1, message.getAliasList() );
-		
-		mCRC = message.mCRC;
-	}
+         * means it passed the CRC */
+        mCRC = new CRC[3];
+        mCRC[0] = CRC.PASSED;
 
-	@Override
-	public boolean isEncrypted()
-	{
-		return mMessage.get( ENCRYPTION_FLAG );
-	}
-	
-	private void checkCRC()
-	{
-    	mCRC[ 1 ] = CRC.PASSED;
+        checkCRC();
+    }
+
+    /**
+     * Subclass constructor from an existing LDU1Message
+     */
+    protected LDU1Message(LDU1Message message)
+    {
+        super(message.getSourceMessage(), DataUnitID.LDU1, message.getAliasList());
+
+        mCRC = message.mCRC;
+    }
+
+    /**
+     * Indicates if the contents of the Link Control Word are encrypted.
+     *
+     * @return true if the contents of the LCW are encrypted.
+     */
+    public boolean isEncryptedLinkControlWord()
+    {
+        return mMessage.get(ENCRYPTED_LINK_CONTROL_WORD_FLAG);
+    }
+
+    private void checkCRC()
+    {
+        mCRC[1] = CRC.PASSED;
 
     	/* Hamming( 10,6,3 ) error detection and correction */
-		for( int index: GOLAY_WORD_STARTS )
-		{
-			int errors = Hamming10.checkAndCorrect( mMessage, index );
-			
-			if( errors > 1 )
-			{
-				mCRC[ 1 ] = CRC.FAILED_CRC;
-			}
-		}
+        for(int index : GOLAY_WORD_STARTS)
+        {
+            int errors = Hamming10.checkAndCorrect(mMessage, index);
+
+            if(errors > 1)
+            {
+                mCRC[1] = CRC.FAILED_CRC;
+            }
+        }
 
 		/* Reed-Solomon( 24,16,9 ) error detection and correction
 		 * Check the Reed-Solomon parity bits. The RS decoder expects the code 
 		 * words and reed solomon parity hex codewords in reverse order.  
 		 * 
 		 * Since this is a truncated RS(63) codes, we pad the code with zeros */
-        int[] input = new int [63];
-        int[] output = new int [63];
-        
-        input[  0 ] = mMessage.getInt( RS_HEX_11 );
-        input[  1 ] = mMessage.getInt( RS_HEX_10 );
-        input[  2 ] = mMessage.getInt( RS_HEX_9 );
-        input[  3 ] = mMessage.getInt( RS_HEX_8 );
-        input[  4 ] = mMessage.getInt( RS_HEX_7 );
-        input[  5 ] = mMessage.getInt( RS_HEX_6 );
-        input[  6 ] = mMessage.getInt( RS_HEX_5 );
-        input[  7 ] = mMessage.getInt( RS_HEX_4 );
-        input[  8 ] = mMessage.getInt( RS_HEX_3 );
-        input[  9 ] = mMessage.getInt( RS_HEX_2 );
-        input[ 10 ] = mMessage.getInt( RS_HEX_1 );
-        input[ 11 ] = mMessage.getInt( RS_HEX_0 );
-        
-        input[ 12 ] = mMessage.getInt( CW_HEX_11 );
-        input[ 13 ] = mMessage.getInt( CW_HEX_10 );
-        input[ 14 ] = mMessage.getInt( CW_HEX_9 );
-        input[ 15 ] = mMessage.getInt( CW_HEX_8 );
-        input[ 16 ] = mMessage.getInt( CW_HEX_7 );
-        input[ 17 ] = mMessage.getInt( CW_HEX_6 );
-        input[ 18 ] = mMessage.getInt( CW_HEX_5 );
-        input[ 19 ] = mMessage.getInt( CW_HEX_4 );
-        input[ 20 ] = mMessage.getInt( CW_HEX_3 );
-        input[ 21 ] = mMessage.getInt( CW_HEX_2 );
-        input[ 22 ] = mMessage.getInt( CW_HEX_1 );
-        input[ 23 ] = mMessage.getInt( CW_HEX_0 );
+        int[] input = new int[63];
+        int[] output = new int[63];
+
+        input[0] = mMessage.getInt(RS_HEX_11);
+        input[1] = mMessage.getInt(RS_HEX_10);
+        input[2] = mMessage.getInt(RS_HEX_9);
+        input[3] = mMessage.getInt(RS_HEX_8);
+        input[4] = mMessage.getInt(RS_HEX_7);
+        input[5] = mMessage.getInt(RS_HEX_6);
+        input[6] = mMessage.getInt(RS_HEX_5);
+        input[7] = mMessage.getInt(RS_HEX_4);
+        input[8] = mMessage.getInt(RS_HEX_3);
+        input[9] = mMessage.getInt(RS_HEX_2);
+        input[10] = mMessage.getInt(RS_HEX_1);
+        input[11] = mMessage.getInt(RS_HEX_0);
+
+        input[12] = mMessage.getInt(CW_HEX_11);
+        input[13] = mMessage.getInt(CW_HEX_10);
+        input[14] = mMessage.getInt(CW_HEX_9);
+        input[15] = mMessage.getInt(CW_HEX_8);
+        input[16] = mMessage.getInt(CW_HEX_7);
+        input[17] = mMessage.getInt(CW_HEX_6);
+        input[18] = mMessage.getInt(CW_HEX_5);
+        input[19] = mMessage.getInt(CW_HEX_4);
+        input[20] = mMessage.getInt(CW_HEX_3);
+        input[21] = mMessage.getInt(CW_HEX_2);
+        input[22] = mMessage.getInt(CW_HEX_1);
+        input[23] = mMessage.getInt(CW_HEX_0);
         /* indexes 24 - 62 are defaulted to zero */
 
-        boolean irrecoverableErrors = mReedSolomonDecoder.decode( input, output );
+        boolean irrecoverableErrors = mReedSolomonDecoder.decode(input, output);
 
-        if( irrecoverableErrors )
+        if(irrecoverableErrors)
         {
-        	mCRC[ 2 ] = CRC.FAILED_CRC;
+            mCRC[2] = CRC.FAILED_CRC;
         }
         else
         {
         	/* Since we've detected that we can correct the RS words, mark the
         	 * hamming crc as corrected as well, if it is currently failed */
-        	if( mCRC[ 1 ] == CRC.FAILED_CRC )
-        	{
-				mCRC[ 1 ] = CRC.CORRECTED;
-        	}
-        	
-        	mCRC[ 2 ] = CRC.PASSED;
+            if(mCRC[1] == CRC.FAILED_CRC)
+            {
+                mCRC[1] = CRC.CORRECTED;
+            }
+
+            mCRC[2] = CRC.PASSED;
         	
         	/* Only fix the codeword data hex codewords */
-        	repairHexCodeword( input, output, 12, CW_HEX_11 );
-        	repairHexCodeword( input, output, 13, CW_HEX_10 );
-        	repairHexCodeword( input, output, 14, CW_HEX_9 );
-        	repairHexCodeword( input, output, 15, CW_HEX_8 );
-        	repairHexCodeword( input, output, 16, CW_HEX_7 );
-        	repairHexCodeword( input, output, 17, CW_HEX_6 );
-        	repairHexCodeword( input, output, 18, CW_HEX_5 );
-        	repairHexCodeword( input, output, 19, CW_HEX_4 );
-        	repairHexCodeword( input, output, 20, CW_HEX_3 );
-        	repairHexCodeword( input, output, 21, CW_HEX_2 );
-        	repairHexCodeword( input, output, 22, CW_HEX_1 );
-        	repairHexCodeword( input, output, 23, CW_HEX_0 );
+            repairHexCodeword(input, output, 12, CW_HEX_11);
+            repairHexCodeword(input, output, 13, CW_HEX_10);
+            repairHexCodeword(input, output, 14, CW_HEX_9);
+            repairHexCodeword(input, output, 15, CW_HEX_8);
+            repairHexCodeword(input, output, 16, CW_HEX_7);
+            repairHexCodeword(input, output, 17, CW_HEX_6);
+            repairHexCodeword(input, output, 18, CW_HEX_5);
+            repairHexCodeword(input, output, 19, CW_HEX_4);
+            repairHexCodeword(input, output, 20, CW_HEX_3);
+            repairHexCodeword(input, output, 21, CW_HEX_2);
+            repairHexCodeword(input, output, 22, CW_HEX_1);
+            repairHexCodeword(input, output, 23, CW_HEX_0);
         }
-	}
-	
-	private void repairHexCodeword( int[] input, int[] output, int index, int[] indexSet )
-	{
-		if( input[ index ] != output[ index ] )
-		{
-			mMessage.load( indexSet[ 0 ], 6, output[ index ] );
-			mCRC[ 2 ] = CRC.CORRECTED;
-		}
-	}
-	
-	@Override
-	public String getMessage()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		sb.append( getMessageStub() );
-		sb.append( " " );
-		sb.append( mMessage.toString() );
-		
-		return sb.toString();
-	}
-	
-    public String getMessageStub()
-    {
-		StringBuilder sb = new StringBuilder();
-
-		sb.append( super.getMessageStub() );
-		
-		if( isEncrypted() )
-		{
-			sb.append( "ENCRYPTED" );
-		}
-		else
-		{
-			if( isImplicitFormat() || getVendor() == Vendor.STANDARD )
-			{
-				sb.append( getOpcode().getLabel() );
-			}
-			else
-			{
-				sb.append( "VENDOR:" + getVendor().getLabel() + " " );
-				sb.append( getVendorOpcode().getLabel() );
-			}
-		}
-
-	    return sb.toString();
     }
 
-	public boolean isImplicitFormat()
-	{
-		return mMessage.get( IMPLICIT_VENDOR_FLAG );
-	}
-	
-	public LinkControlOpcode getOpcode()
-	{
-		return LinkControlOpcode.fromValue( mMessage.getInt( OPCODE ) );
-	}
+    private void repairHexCodeword(int[] input, int[] output, int index, int[] indexSet)
+    {
+        if(input[index] != output[index])
+        {
+            mMessage.load(indexSet[0], 6, output[index]);
+            mCRC[2] = CRC.CORRECTED;
+        }
+    }
 
-	public VendorLinkControlOpcode getVendorOpcode()
-	{
-		return VendorLinkControlOpcode.fromValue( mMessage.getInt( OPCODE ) );
-	}
-	
-	public Vendor getVendor()
-	{
-		if( isImplicitFormat() )
-		{
-			return Vendor.STANDARD;
-		}
-		
-		return Vendor.fromValue( mMessage.getInt( VENDOR ) );
-	}
+    @Override
+    public String getMessage()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(getMessageStub());
+        sb.append(" ");
+        sb.append(mMessage.toString());
+
+        return sb.toString();
+    }
+
+    public String getMessageStub()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(super.getMessageStub());
+
+        if(isEncryptedLinkControlWord())
+        {
+            sb.append("ENCRYPTED");
+        }
+        else
+        {
+            if(isImplicitFormat() || getVendor() == Vendor.STANDARD)
+            {
+                sb.append(getOpcode().getLabel());
+            }
+            else
+            {
+                sb.append("VENDOR:" + getVendor().getLabel() + " ");
+                sb.append(getVendorOpcode().getLabel());
+            }
+        }
+
+        return sb.toString();
+    }
+
+    public boolean isImplicitFormat()
+    {
+        return mMessage.get(IMPLICIT_VENDOR_FLAG);
+    }
+
+    public LinkControlOpcode getOpcode()
+    {
+        return LinkControlOpcode.fromValue(mMessage.getInt(OPCODE));
+    }
+
+    public VendorLinkControlOpcode getVendorOpcode()
+    {
+        return VendorLinkControlOpcode.fromValue(mMessage.getInt(OPCODE));
+    }
+
+    public Vendor getVendor()
+    {
+        if(isImplicitFormat())
+        {
+            return Vendor.STANDARD;
+        }
+
+        return Vendor.fromValue(mMessage.getInt(VENDOR));
+    }
 }

src/module/decode/p25/message/ldu/LDU2Message.java

@@ -72,9 +72,11 @@ public class LDU2Message extends LDUMessage
 	    
 	    checkCRC();
     }
-	
-	@Override
-	public boolean isEncrypted()
+
+	/**
+	 * Indicates if the audio stream is encrypted
+	 */
+	public boolean isEncryptedAudio()
 	{
 		Encryption encryption = getEncryption();
 		

src/module/decode/p25/message/ldu/LDUMessage.java

@@ -35,8 +35,6 @@ public abstract class LDUMessage extends P25Message
 	    super( message, duid, aliasList );
     }
 	
-	public abstract boolean isEncrypted();
-	
 	@Override
     public String getMessage()
     {

src/module/decode/p25/message/tsbk/osp/control/IdentifierUpdateTDMA.java

@@ -41,7 +41,7 @@ public class IdentifierUpdateTDMA extends IdentifierUpdate
 
 		sb.append( " ID:" + getIdentifier() );
 		sb.append( " BASE:" + getBaseFrequency() );
-		sb.append( " BW:" + getBandwidth() );
+		sb.append( " BANDWIDTH:" + getBandwidth() );
 		sb.append( " SPACING:" + getChannelSpacing() );
 		sb.append( " OFFSET:" + getTransmitOffset() );
 		sb.append( " TYPE:" + getChannelType().toString() );
@@ -137,7 +137,7 @@ public class IdentifierUpdateTDMA extends IdentifierUpdate
     		
     		sb.append( mAccessType.name() );
     		sb.append( " BANDWIDTH:" + mBandwidth );
-    		sb.append( " SLOT/CARRIER:" + mSlotsPerCarrier );
+    		sb.append( " TIMESLOTS PER CARRIER:" + mSlotsPerCarrier );
     		sb.append( " VOCODER:" + mVocoder.name() );
     		
     		return sb.toString();

src/sample/OverflowableTransferQueue.java

@@ -124,10 +124,6 @@ public class OverflowableTransferQueue<E>
             mQueue.clear();
             mCounter.set(0);
             mOverflow.set(false);
-            if(mOverflowListener != null)
-            {
-                mOverflowListener.sourceOverflow(false);
-            }
         }
     }
 }

src/source/Source.java

@@ -17,6 +17,7 @@
  ******************************************************************************/
 package source;
 
+import channel.heartbeat.IHeartbeatProvider;
 import module.Module;
 import sample.SampleType;
 import sample.real.IOverflowListener;
@@ -26,7 +27,8 @@ import source.tuner.frequency.IFrequencyChangeProvider;
 /**
  * Abstract class to define the minimum functionality of a sample data provider.
  */
-public abstract class Source extends Module implements IFrequencyChangeListener, IFrequencyChangeProvider
+public abstract class Source extends Module implements IFrequencyChangeListener, IFrequencyChangeProvider,
+    IHeartbeatProvider
 {
     protected SampleType mSampleType;
     protected IOverflowListener mOverflowListener;

src/source/mixer/RealMixerSource.java

@@ -1,174 +1,191 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package source.mixer;
 
-import java.util.Iterator;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.LineUnavailableException;
-import javax.sound.sampled.TargetDataLine;
-
+import channel.heartbeat.Heartbeat;
+import dsp.gain.AutomaticGainControl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sample.Listener;
 import sample.adapter.ISampleAdapter;
 import sample.real.RealBuffer;
 import source.RealSource;
 import source.SourceException;
-import dsp.gain.AutomaticGainControl;
 import source.tuner.frequency.FrequencyChangeEvent;
 
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.TargetDataLine;
+import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 public class RealMixerSource extends RealSource
 {
-	private final static Logger mLog = LoggerFactory.getLogger( RealMixerSource.class );
+    private final static Logger mLog = LoggerFactory.getLogger(RealMixerSource.class);
 
-	private long mFrequency = 0;
-	private int mBufferSize = 16384;
-	
-	private BufferReader mBufferReader = new BufferReader();
-	private TargetDataLine mTargetDataLine;
-	private AudioFormat mAudioFormat;
-	private int mBytesPerFrame = 0;
-	private ISampleAdapter mSampleAdapter;
-	private AutomaticGainControl mAGC = new AutomaticGainControl();
-	
-	CopyOnWriteArrayList<Listener<RealBuffer>> mSampleListeners = new CopyOnWriteArrayList<Listener<RealBuffer>>();
-    
-	/**
-	 * Real Mixer Source - constructs a reader on the mixer/sound card target 
-	 * data line using the specified audio format (sample size, sample rate ) 
-	 * and broadcasts real buffers (float arrays) to all registered listeners.  
-	 * Reads buffers sized to 10% of the sample rate specified in audio format.
-	 * 
-	 * @param targetDataLine - mixer or sound card to be used
-	 * 
-	 * @param format - audio format
-	 * 
-	 * @param name - token name to use for this source
-	 * 
-	 * @param sampleAdapter - adapter to convert byte array data read from the
-	 * mixer into float array data.  Can optionally invert the channel data if
-	 * the left/right stereo channels are inverted.
-	 */
-    public RealMixerSource( TargetDataLine targetDataLine, 
-    						AudioFormat format,
-    						ISampleAdapter sampleAdapter )
+    private long mFrequency = 0;
+    private int mBufferSize = 16384;
+
+    private BufferReader mBufferReader = new BufferReader();
+    private TargetDataLine mTargetDataLine;
+    private AudioFormat mAudioFormat;
+    private int mBytesPerFrame = 0;
+    private ISampleAdapter mSampleAdapter;
+    private AutomaticGainControl mAGC = new AutomaticGainControl();
+    private Listener<Heartbeat> mHeartbeatListener;
+    private static final Heartbeat HEARTBEAT = new Heartbeat();
+
+    private CopyOnWriteArrayList<Listener<RealBuffer>> mSampleListeners = new CopyOnWriteArrayList<Listener<RealBuffer>>();
+
+    /**
+     * Real Mixer Source - constructs a reader on the mixer/sound card target
+     * data line using the specified audio format (sample size, sample rate )
+     * and broadcasts real buffers (float arrays) to all registered listeners.
+     * Reads buffers sized to 10% of the sample rate specified in audio format.
+     *
+     * @param targetDataLine - mixer or sound card to be used
+     * @param format - audio format
+     * @param sampleAdapter - adapter to convert byte array data read from the
+     * mixer into float array data.  Can optionally invert the channel data if
+     * the left/right stereo channels are inverted.
+     */
+    public RealMixerSource(TargetDataLine targetDataLine,
+                           AudioFormat format,
+                           ISampleAdapter sampleAdapter)
     {
-    	mTargetDataLine = targetDataLine;
+        mTargetDataLine = targetDataLine;
         mAudioFormat = format;
         mSampleAdapter = sampleAdapter;
     }
 
-	@Override
-	public void setFrequencyChangeListener(Listener<FrequencyChangeEvent> listener)
-	{
-		//Not implemented
-	}
-
-	@Override
-	public void removeFrequencyChangeListener()
-	{
-		//Not implemented
-	}
-
-	@Override
-	public Listener<FrequencyChangeEvent> getFrequencyChangeListener()
-	{
-		//Not implemented
-		return null;
-	}
-
-	@Override
-	public void reset()
-	{
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-	}
-
-	@Override
-	public void stop()
-	{
-	}
-
-	public void setListener( Listener<RealBuffer> listener )
+    @Override
+    public void setFrequencyChangeListener(Listener<FrequencyChangeEvent> listener)
     {
-		mSampleListeners.add( listener );
-		
-		/* If this is the first listener, start the reader thread */
-		if( !mBufferReader.isRunning() )
-		{
-			Thread thread = new Thread( mBufferReader );
-			thread.setDaemon( true );
-			thread.setName( "Sample Reader" );
-			thread.start();
-		}
+        //Not implemented
     }
 
-    public void removeListener( Listener<RealBuffer> listener )
+    @Override
+    public void removeFrequencyChangeListener()
     {
-		mSampleListeners.remove( listener );
+        //Not implemented
+    }
+
+    @Override
+    public Listener<FrequencyChangeEvent> getFrequencyChangeListener()
+    {
+        //Not implemented
+        return null;
+    }
+
+    /**
+     * Registers the listener to receive heartbeats from this source.
+     *
+     * @param listener to receive heartbeats
+     */
+    @Override
+    public void setHeartbeatListener(Listener<Heartbeat> listener)
+    {
+        mHeartbeatListener = listener;
+    }
+
+    /**
+     * Removes the currently registered heartbeat listener
+     */
+    @Override
+    public void removeHeartbeatListener()
+    {
+        mHeartbeatListener = null;
+    }
+
+    @Override
+    public void reset()
+    {
+    }
+
+    @Override
+    public void start(ScheduledExecutorService executor)
+    {
+    }
+
+    @Override
+    public void stop()
+    {
+    }
+
+    public void setListener(Listener<RealBuffer> listener)
+    {
+        mSampleListeners.add(listener);
+
+		/* If this is the first listener, start the reader thread */
+        if(!mBufferReader.isRunning())
+        {
+            Thread thread = new Thread(mBufferReader);
+            thread.setDaemon(true);
+            thread.setName("Sample Reader");
+            thread.start();
+        }
+    }
+
+    public void removeListener(Listener<RealBuffer> listener)
+    {
+        mSampleListeners.remove(listener);
 
 		/* If this is the laster listener, stop the reader thread */
-		if( mSampleListeners.isEmpty() )
-		{
-			mBufferReader.stop();
-		}
+        if(mSampleListeners.isEmpty())
+        {
+            mBufferReader.stop();
+        }
     }
 
-    public void broadcast( RealBuffer samples )
+    public void broadcast(RealBuffer samples)
     {
-		Iterator<Listener<RealBuffer>> it = mSampleListeners.iterator();
-		
-		while( it.hasNext() )
-		{
-			Listener<RealBuffer> next = it.next();
+        Iterator<Listener<RealBuffer>> it = mSampleListeners.iterator();
+
+        while(it.hasNext())
+        {
+            Listener<RealBuffer> next = it.next();
 			
 			/* if this is the last (or only) listener, send him the original 
 			 * buffer, otherwise send him a copy of the buffer */
-			if( it.hasNext() )
-			{
-				next.receive( samples.copyOf() );
-			}
-			else
-			{
-				next.receive( samples );
-			}
-		}
+            if(it.hasNext())
+            {
+                next.receive(samples.copyOf());
+            }
+            else
+            {
+                next.receive(samples);
+            }
+        }
     }
-    
+
     public int getSampleRate()
     {
-		if( mTargetDataLine != null )
-		{
-		    return (int)mTargetDataLine.getFormat().getSampleRate();
-		}
-		else
-		{
-			return 0;
-		}
+        if(mTargetDataLine != null)
+        {
+            return (int)mTargetDataLine.getFormat().getSampleRate();
+        }
+        else
+        {
+            return 0;
+        }
     }
 
     /**
@@ -176,7 +193,7 @@ public class RealMixerSource extends RealSource
      */
     public long getFrequency() throws SourceException
     {
-	    return mFrequency;
+        return mFrequency;
     }
 
     /**
@@ -184,122 +201,128 @@ public class RealMixerSource extends RealSource
      * be useful if you are streaming an external audio source in through the
      * sound card and you want to specify a frequency for that source
      */
-    public void setFrequency( long frequency )
+    public void setFrequency(long frequency)
     {
-    	mFrequency = frequency;
+        mFrequency = frequency;
     }
 
-	/**
-	 * Reader thread.  Performs blocking read against the mixer target data 
-	 * line, converts the samples to an array of floats using the specified 
-	 * adapter.  Dispatches float arrays to all registered listeners.
-	 */
-	public class BufferReader implements Runnable
-	{
-		private AtomicBoolean mRunning = new AtomicBoolean();
-		
-		@Override
+    /**
+     * Reader thread.  Performs blocking read against the mixer target data
+     * line, converts the samples to an array of floats using the specified
+     * adapter.  Dispatches float arrays to all registered listeners.
+     */
+    public class BufferReader implements Runnable
+    {
+        private AtomicBoolean mRunning = new AtomicBoolean();
+
+        @Override
         public void run()
         {
-			if( mRunning.compareAndSet( false, true ) )
-			{
-        		if( mTargetDataLine == null )
-        		{
-        			mRunning.set( false );
+            if(mRunning.compareAndSet(false, true))
+            {
+                //Send a heartbeat every time we run
+                if(mHeartbeatListener != null)
+                {
+                    mHeartbeatListener.receive(HEARTBEAT);
+                }
 
-        			mLog.error( "ComplexMixerSource - mixer target data line"
-                			+ " is null" );
-        		}
-        		else
-        		{
-        			mBytesPerFrame = mAudioFormat.getSampleSizeInBits() / 8;
+                if(mTargetDataLine == null)
+                {
+                    mRunning.set(false);
 
-    	    		if( mBytesPerFrame == AudioSystem.NOT_SPECIFIED )
-    	            {
-    	                mBytesPerFrame = 2;
-    	            }
+                    mLog.error("ComplexMixerSource - mixer target data line"
+                        + " is null");
+                }
+                else
+                {
+                    mBytesPerFrame = mAudioFormat.getSampleSizeInBits() / 8;
+
+                    if(mBytesPerFrame == AudioSystem.NOT_SPECIFIED)
+                    {
+                        mBytesPerFrame = 2;
+                    }
     	    		
     	    		/* Set buffer size to 1/10 second of samples */
-    	    		mBufferSize = (int)( mAudioFormat.getSampleRate() 
-    	    				* 0.05 ) * mBytesPerFrame;
+                    mBufferSize = (int)(mAudioFormat.getSampleRate()
+                        * 0.05) * mBytesPerFrame;
 
             		/* We'll reuse the same buffer for each read */
-            		byte[] buffer = new byte[ mBufferSize ];
-            		
-            		try
-                    {
-	                    mTargetDataLine.open( mAudioFormat );
+                    byte[] buffer = new byte[mBufferSize];
 
-	                    mTargetDataLine.start();
-                    }
-                    catch ( LineUnavailableException e )
+                    try
                     {
-                    	mLog.error( "ComplexMixerSource - mixer target data line"
-                    			+ "not available to read data from", e );
-                    	
-                    	mRunning.set( false );
+                        mTargetDataLine.open(mAudioFormat);
+
+                        mTargetDataLine.start();
                     }
-            		
-            		while( mRunning.get() )
-    				{
-        				try
+                    catch(LineUnavailableException e)
+                    {
+                        mLog.error("ComplexMixerSource - mixer target data line"
+                            + "not available to read data from", e);
+
+                        mRunning.set(false);
+                    }
+
+                    while(mRunning.get())
+                    {
+                        try
                         {
             				/* Blocking read - waits until the buffer fills */
-        					mTargetDataLine.read( buffer, 0, buffer.length );
+                            mTargetDataLine.read(buffer, 0, buffer.length);
 
 	                        /* Convert samples to float array */
-	            			float[] samples =  
-	            					mSampleAdapter.convert( buffer );
+                            float[] samples =
+                                mSampleAdapter.convert(buffer);
 	            			
 	            			/* Dispatch samples to registered listeners */
-	            			broadcast( new RealBuffer( samples ) );
+                            broadcast(new RealBuffer(samples));
                         }
-                        catch ( Exception e )
+                        catch(Exception e)
                         {
-                        	mLog.error( "ComplexMixerSource - error while reading"
-                        			+ "from the mixer target data line", e );
-                        	
-                        	mRunning.set( false );
+                            mLog.error("ComplexMixerSource - error while reading"
+                                + "from the mixer target data line", e);
+
+                            mRunning.set(false);
                         }
-    				}
-        		}
+                    }
+                }
         		
         		/* Close the data line if it is still open */
-        		if( mTargetDataLine != null && mTargetDataLine.isOpen() )
-        		{
-        			mTargetDataLine.close();
-        		}
-			}
+                if(mTargetDataLine != null && mTargetDataLine.isOpen())
+                {
+                    mTargetDataLine.close();
+                }
+            }
         }
 
-		/**
-		 * Stops the reader thread
-		 */
-		public void stop()
-		{
-			if( mRunning.compareAndSet( true, false ) )
-			{
-				mTargetDataLine.stop();
-				mTargetDataLine.close();
-			}
-		}
+        /**
+         * Stops the reader thread
+         */
+        public void stop()
+        {
+            if(mRunning.compareAndSet(true, false))
+            {
+                mTargetDataLine.stop();
+                mTargetDataLine.close();
+            }
+        }
 
-		/**
-		 * Indicates if the reader thread is running
-		 */
-		public boolean isRunning()
-		{
-			return mRunning.get();
-		}
-	}
+        /**
+         * Indicates if the reader thread is running
+         */
+        public boolean isRunning()
+        {
+            return mRunning.get();
+        }
+    }
 
-	@Override
+    @Override
     public void dispose()
     {
-		if( mBufferReader != null )
-		{
-			mBufferReader.stop();
-			mSampleListeners.clear();			
-		}
+        if(mBufferReader != null)
+        {
+            mBufferReader.stop();
+            mSampleListeners.clear();
+        }
     }
 }

src/source/tuner/TunerChannelSource.java

@@ -18,6 +18,8 @@
  ******************************************************************************/
 package source.tuner;
 
+import channel.heartbeat.Heartbeat;
+import channel.heartbeat.IHeartbeatProvider;
 import dsp.filter.FilterFactory;
 import dsp.filter.Window.WindowType;
 import dsp.filter.cic.ComplexPrimeCICDecimate;
@@ -58,6 +60,7 @@ public class TunerChannelSource extends ComplexSource implements IFrequencyChang
 
     private static int CHANNEL_RATE = 48000;
     private static int CHANNEL_PASS_FREQUENCY = 12000;
+    private static final Heartbeat HEARTBEAT = new Heartbeat();
 
     private OverflowableTransferQueue<ComplexBuffer> mBuffer;
 
@@ -66,6 +69,7 @@ public class TunerChannelSource extends ComplexSource implements IFrequencyChang
     private Oscillator mMixer;
     private ComplexPrimeCICDecimate mDecimationFilter;
     private Listener<ComplexBuffer> mListener;
+    private Listener<Heartbeat> mHeartbeatListener;
     private IFrequencyChangeProcessor mFrequencyChangeProcessor;
     private DownstreamProcessor mDownstreamFrequencyEventProcessor = new DownstreamProcessor();
     private ScheduledFuture<?> mTaskHandle;
@@ -352,6 +356,25 @@ public class TunerChannelSource extends ComplexSource implements IFrequencyChang
         return mDownstreamFrequencyEventProcessor.getFrequencyChangeListener();
     }
 
+    /**
+     * Registers the listener to receive heartbeats from this source.
+     * @param listener to receive heartbeats
+     */
+    @Override
+    public void setHeartbeatListener(Listener<Heartbeat> listener)
+    {
+        mHeartbeatListener = listener;
+    }
+
+    /**
+     * Removes the currently registered heartbeat listener
+     */
+    @Override
+    public void removeHeartbeatListener()
+    {
+        mHeartbeatListener = null;
+    }
+
     /**
      * Managers frequency change requests and notifications from/to any downstream component.  Downstream
      * components are those that receive samples from this tuner channel source.  These downstream components will be
@@ -477,6 +500,13 @@ public class TunerChannelSource extends ComplexSource implements IFrequencyChang
             {
                 if(mProcessing)
                 {
+                    //Send a heartbeat every time this runs to allow downstream components to perform periodic
+                    //state monitoring functions on this thread
+                    if(mHeartbeatListener != null)
+                    {
+                        mHeartbeatListener.receive(HEARTBEAT);
+                    }
+
                     mBuffer.drainTo(mSampleBuffers, 20);
 
                     for(Buffer buffer : mSampleBuffers)

src/source/tuner/usb/USBTransferProcessor.java

@@ -54,7 +54,7 @@ public class USBTransferProcessor implements TransferCallback
     private static final int TRANSFER_BUFFER_POOL_SIZE = 16;
 
     //Maximum number of filled buffers for the blocking queue
-    private static final int FILLED_BUFFER_MAX_CAPACITY = 300;
+    private static final int FILLED_BUFFER_MAX_CAPACITY = 500;
 
     //Threshold for resetting buffer overflow condition
     private static final int FILLED_BUFFER_OVERFLOW_RESET_THRESHOLD = 100;
@@ -200,7 +200,7 @@ public class USBTransferProcessor implements TransferCallback
 
 
             //Unregister from LibUSB processor so that it auto-stops LibUSB processing
-            TunerManager.LIBUSB_TRANSFER_PROCESSOR.registerTransferProcessor(this);
+            TunerManager.LIBUSB_TRANSFER_PROCESSOR.unregisterTransferProcessor(this);
 
             //Directly invoke the timeout handler to ensure that our cancelled transfer buffers are flushed.
             int result = LibUsb.handleEventsTimeoutCompleted(null, USB_TIMEOUT_MS,
@@ -415,23 +415,27 @@ public class USBTransferProcessor implements TransferCallback
         @Override
         public void run()
         {
-            try
-            {
-                mFilledBuffers.drainTo(mBuffersToDispatch, 15);
+            mFilledBuffers.drainTo(mBuffersToDispatch, 50);
 
-                for(byte[] buffer : mBuffersToDispatch)
+            while(!mBuffersToDispatch.isEmpty())
+            {
+                try
                 {
-                    float[] complexSamples = mSampleAdapter.convert(buffer);
+                    for(byte[] buffer : mBuffersToDispatch)
+                    {
+                        float[] complexSamples = mSampleAdapter.convert(buffer);
 
-                    mComplexBufferBroadcaster.broadcast(new ComplexBuffer(complexSamples));
+                        mComplexBufferBroadcaster.broadcast(new ComplexBuffer(complexSamples));
+                    }
+                }
+                catch(Exception e)
+                {
+                    mLog.error(mDeviceName + " - error while dispatching complex IQ buffer samples", e);
                 }
-            }
-            catch(Exception e)
-            {
-                mLog.error(mDeviceName + " - error while dispatching complex IQ buffer samples", e);
-            }
 
-            mBuffersToDispatch.clear();
+                mBuffersToDispatch.clear();
+                mFilledBuffers.drainTo(mBuffersToDispatch, 50);
+            }
         }
     }
 }

src/source/wave/ComplexWaveSource.java

@@ -18,19 +18,9 @@
  ******************************************************************************/
 package source.wave;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.UnsupportedAudioFileException;
-
+import channel.heartbeat.Heartbeat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sample.ConversionUtils;
 import sample.Listener;
 import sample.complex.ComplexBuffer;
@@ -39,22 +29,31 @@ import source.IControllableFileSource;
 import source.IFrameLocationListener;
 import source.tuner.frequency.FrequencyChangeEvent;
 
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.UnsupportedAudioFileException;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.concurrent.ScheduledExecutorService;
+
 public class ComplexWaveSource extends ComplexSource implements IControllableFileSource
 {
-	private final static Logger mLog = 
-			LoggerFactory.getLogger( ComplexWaveSource.class );
+    private final static Logger mLog =
+        LoggerFactory.getLogger(ComplexWaveSource.class);
 
-	private IFrameLocationListener mFrameLocationListener;
-	private int mBytesPerFrame;
-	private int mFrameCounter = 0;
+    private IFrameLocationListener mFrameLocationListener;
+    private int mBytesPerFrame;
+    private int mFrameCounter = 0;
     private long mFrequency = 0;
     private Listener<ComplexBuffer> mListener;
     private AudioInputStream mInputStream;
     private File mFile;
-    
-    public ComplexWaveSource( File file ) throws IOException 
+
+    public ComplexWaveSource(File file) throws IOException
     {
-    	mFile = file;
+        mFile = file;
     }
 
     @Override
@@ -76,89 +75,105 @@ public class ComplexWaveSource extends ComplexSource implements IControllableFil
         return null;
     }
 
+    /**
+     * Not implemented
+     */
     @Override
-	public void reset()
-	{
-		stop();
-		start( null );
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-		try
-		{
-			open();
-		} 
-		catch ( IOException | UnsupportedAudioFileException e )
-		{
-			mLog.error( "Error starting complex wave source" );
-		}
-	}
-
-	@Override
-	public void stop()
-	{
-		try
-		{
-			close();
-		} 
-		catch ( IOException e )
-		{
-			mLog.error( "Error stopping complex wave source" );
-		}
-	}
-
-	@Override
-	public long getFrameCount() throws IOException
-	{
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-    public int getSampleRate()
+    public void setHeartbeatListener(Listener<Heartbeat> listener)
     {
-		if( mInputStream != null )
-		{
-			return (int)mInputStream.getFormat().getSampleRate();
-		}
-		
-		return 0;
     }
 
-	/**
-	 * Returns the frequency set for this file.  Normally returns zero, but
-	 * the value can be set with setFrequency() method.
-	 */
+    /**
+     * Not implemented
+     */
+    @Override
+    public void removeHeartbeatListener()
+    {
+    }
+
+    @Override
+    public void reset()
+    {
+        stop();
+        start(null);
+    }
+
+    @Override
+    public void start(ScheduledExecutorService executor)
+    {
+        try
+        {
+            open();
+        }
+        catch(IOException | UnsupportedAudioFileException e)
+        {
+            mLog.error("Error starting complex wave source");
+        }
+    }
+
+    @Override
+    public void stop()
+    {
+        try
+        {
+            close();
+        }
+        catch(IOException e)
+        {
+            mLog.error("Error stopping complex wave source");
+        }
+    }
+
+    @Override
+    public long getFrameCount() throws IOException
+    {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getSampleRate()
+    {
+        if(mInputStream != null)
+        {
+            return (int)mInputStream.getFormat().getSampleRate();
+        }
+
+        return 0;
+    }
+
+    /**
+     * Returns the frequency set for this file.  Normally returns zero, but
+     * the value can be set with setFrequency() method.
+     */
     public long getFrequency()
     {
-	    return mFrequency;
+        return mFrequency;
     }
 
     /**
      * Changes the value returned from getFrequency() for this source.
      */
-    public void setFrequency( long frequency )
+    public void setFrequency(long frequency)
     {
-    	mFrequency = frequency;
+        mFrequency = frequency;
     }
-    
+
     /**
      * Closes the source file
      */
     public void close() throws IOException
     {
-    	if( mInputStream != null )
-    	{
-        	mInputStream.close();
-    	}
-    	else
-    	{
-    		throw new IOException( "Can't close wave source - was not opened" );
-    	}
-    	
-    	mInputStream = null;
+        if(mInputStream != null)
+        {
+            mInputStream.close();
+        }
+        else
+        {
+            throw new IOException("Can't close wave source - was not opened");
+        }
+
+        mInputStream = null;
     }
 
     /**
@@ -166,121 +181,121 @@ public class ComplexWaveSource extends ComplexSource implements IControllableFil
      */
     public void open() throws IOException, UnsupportedAudioFileException
     {
-    	if( mInputStream == null )
-    	{
-        	mInputStream = AudioSystem.getAudioInputStream( mFile );
-    	}
-    	else
-    	{
-    		throw new IOException( "Can't open wave source - is already opened" );
-    	}
+        if(mInputStream == null)
+        {
+            mInputStream = AudioSystem.getAudioInputStream(mFile);
+        }
+        else
+        {
+            throw new IOException("Can't open wave source - is already opened");
+        }
 
 
         AudioFormat format = mInputStream.getFormat();
-        
+
         mBytesPerFrame = format.getFrameSize();
 
-        if( format.getChannels() != 2 || format.getSampleSizeInBits() != 16 )
+        if(format.getChannels() != 2 || format.getSampleSizeInBits() != 16)
         {
-        	throw new IOException( "Unsupported Wave Format - EXPECTED: 2 " +
-        		"channels 16-bit samples FOUND: " + 
-    			mInputStream.getFormat().getChannels() + " channels " + 
-        		mInputStream.getFormat().getSampleSizeInBits() + "-bit samples" );
+            throw new IOException("Unsupported Wave Format - EXPECTED: 2 " +
+                "channels 16-bit samples FOUND: " +
+                mInputStream.getFormat().getChannels() + " channels " +
+                mInputStream.getFormat().getSampleSizeInBits() + "-bit samples");
         }
 
         /* Broadcast that we're at frame location 0 */
-        broadcast( 0 );
+        broadcast(0);
     }
 
     /**
      * Reads the number of frames and sends a buffer to the listener
      */
-	@Override
-	public void next( int frames ) throws IOException
-	{
-		next( frames, true );
-	}
-
-	/**
-	 * Reads the number of frames and optionally sends the buffer to the listener
-	 */
-    public void next( int frames, boolean broadcast ) throws IOException
+    @Override
+    public void next(int frames) throws IOException
     {
-        if( mInputStream != null )
+        next(frames, true);
+    }
+
+    /**
+     * Reads the number of frames and optionally sends the buffer to the listener
+     */
+    public void next(int frames, boolean broadcast) throws IOException
+    {
+        if(mInputStream != null)
         {
-        	byte[] buffer = new byte[ mBytesPerFrame * frames ];
-        	
+            byte[] buffer = new byte[mBytesPerFrame * frames];
+
         	/* Fill the buffer with samples from the file */
-        	int samplesRead = mInputStream.read( buffer );
+            int samplesRead = mInputStream.read(buffer);
 
-        	mFrameCounter += samplesRead;
-        	
-        	broadcast( mFrameCounter );
-        	
-        	if( broadcast && mListener != null )
-        	{
-            	if( samplesRead < buffer.length )
-            	{
-            		buffer = Arrays.copyOf( buffer, samplesRead );
-            	}
+            mFrameCounter += samplesRead;
 
-            	float[] samples = ConversionUtils
-            			.convertFromSigned16BitSamples( buffer );
-            	
-            	mListener.receive( new ComplexBuffer( samples ) );
-        	}
+            broadcast(mFrameCounter);
+
+            if(broadcast && mListener != null)
+            {
+                if(samplesRead < buffer.length)
+                {
+                    buffer = Arrays.copyOf(buffer, samplesRead);
+                }
+
+                float[] samples = ConversionUtils
+                    .convertFromSigned16BitSamples(buffer);
+
+                mListener.receive(new ComplexBuffer(samples));
+            }
         }
     }
-    
+
     /**
-     * Registers the listener to receive sample buffers as they are read from 
+     * Registers the listener to receive sample buffers as they are read from
      * the wave file
      */
-	@Override
-	public void setListener( Listener<ComplexBuffer> listener )
-	{
-        mListener = listener;
-	}
-
-	/**
-	 * Unregisters the listener from receiving sample buffers
-	 */
-    public void removeListener( Listener<ComplexBuffer> listener )
+    @Override
+    public void setListener(Listener<ComplexBuffer> listener)
     {
-    	mListener = null;
+        mListener = listener;
     }
 
-	@Override
+    /**
+     * Unregisters the listener from receiving sample buffers
+     */
+    public void removeListener(Listener<ComplexBuffer> listener)
+    {
+        mListener = null;
+    }
+
+    @Override
     public void dispose()
     {
-		mListener = null;
+        mListener = null;
     }
 
-	@Override
-	public File getFile()
-	{
-		return mFile;
-	}
+    @Override
+    public File getFile()
+    {
+        return mFile;
+    }
 
-	private void broadcast( int byteLocation )
-	{
-		int frameLocation = (int)( byteLocation / mBytesPerFrame );
-		
-		if( mFrameLocationListener != null )
-		{
-			mFrameLocationListener.frameLocationUpdated( frameLocation );
-		}
-	}
-	
-	@Override
-	public void setListener( IFrameLocationListener listener )
-	{
-		mFrameLocationListener = listener;
-	}
+    private void broadcast(int byteLocation)
+    {
+        int frameLocation = (int)(byteLocation / mBytesPerFrame);
 
-	@Override
-	public void removeListener( IFrameLocationListener listener )
-	{
-		mFrameLocationListener = null;
-	}
+        if(mFrameLocationListener != null)
+        {
+            mFrameLocationListener.frameLocationUpdated(frameLocation);
+        }
+    }
+
+    @Override
+    public void setListener(IFrameLocationListener listener)
+    {
+        mFrameLocationListener = listener;
+    }
+
+    @Override
+    public void removeListener(IFrameLocationListener listener)
+    {
+        mFrameLocationListener = null;
+    }
 }

src/source/wave/RealWaveSource.java

@@ -1,35 +1,25 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014,2015 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package source.wave;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.UnsupportedAudioFileException;
-
+import channel.heartbeat.Heartbeat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sample.ConversionUtils;
 import sample.Listener;
 import sample.real.RealBuffer;
@@ -38,131 +28,154 @@ import source.IFrameLocationListener;
 import source.RealSource;
 import source.tuner.frequency.FrequencyChangeEvent;
 
-public class RealWaveSource extends RealSource 
-	implements IControllableFileSource, AutoCloseable
-{
-	private final static Logger mLog = 
-			LoggerFactory.getLogger( RealWaveSource.class );
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.UnsupportedAudioFileException;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.concurrent.ScheduledExecutorService;
 
-	private IFrameLocationListener mFrameLocationListener;
-	private int mBytesPerFrame;
-	private int mFrameCounter = 0;
+public class RealWaveSource extends RealSource implements IControllableFileSource, AutoCloseable
+{
+    private final static Logger mLog = LoggerFactory.getLogger(RealWaveSource.class);
+
+    private IFrameLocationListener mFrameLocationListener;
+    private int mBytesPerFrame;
+    private int mFrameCounter = 0;
     private long mFrequency = 0;
     private Listener<RealBuffer> mListener;
     private AudioInputStream mInputStream;
     private File mFile;
-    
-    public RealWaveSource( File file ) throws IOException 
+
+    public RealWaveSource(File file) throws IOException
     {
-    	mFile = file;
+        mFile = file;
     }
 
-	@Override
-	public void setFrequencyChangeListener(Listener<FrequencyChangeEvent> listener)
-	{
-		//Not implemented
-	}
+    @Override
+    public void setFrequencyChangeListener(Listener<FrequencyChangeEvent> listener)
+    {
+        //Not implemented
+    }
 
-	@Override
-	public void removeFrequencyChangeListener()
-	{
-		//Not implemented
-	}
+    @Override
+    public void removeFrequencyChangeListener()
+    {
+        //Not implemented
+    }
 
-	@Override
-	public Listener<FrequencyChangeEvent> getFrequencyChangeListener()
-	{
-		//Not implemented
-		return null;
-	}
+    @Override
+    public Listener<FrequencyChangeEvent> getFrequencyChangeListener()
+    {
+        //Not implemented
+        return null;
+    }
+
+    /**
+     * Not implemented
+     */
+    @Override
+    public void setHeartbeatListener(Listener<Heartbeat> listener)
+    {
+    }
+
+    /**
+     * Not implemented
+     */
+    @Override
+    public void removeHeartbeatListener()
+    {
+    }
 
 
-	@Override
-	public void reset()
-	{
-		stop();
-		start( null );
-	}
+    @Override
+    public void reset()
+    {
+        stop();
+        start(null);
+    }
 
 
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-		try
-		{
-			open();
-		} 
-		catch ( IOException | UnsupportedAudioFileException e )
-		{
-			mLog.error( "Error starting real wave source", e );
-		}
-	}
+    @Override
+    public void start(ScheduledExecutorService executor)
+    {
+        try
+        {
+            open();
+        }
+        catch(IOException | UnsupportedAudioFileException e)
+        {
+            mLog.error("Error starting real wave source", e);
+        }
+    }
 
 
-	@Override
-	public void stop()
-	{
-		try
-		{
-			close();
-		} 
-		catch ( IOException e )
-		{
-			mLog.error( "Error stopping real wave source", e );
-		}
-	}
+    @Override
+    public void stop()
+    {
+        try
+        {
+            close();
+        }
+        catch(IOException e)
+        {
+            mLog.error("Error stopping real wave source", e);
+        }
+    }
 
 
-	@Override
-	public long getFrameCount() throws IOException
-	{
-		// TODO Auto-generated method stub
-		return 0;
-	}
+    @Override
+    public long getFrameCount() throws IOException
+    {
+        // TODO Auto-generated method stub
+        return 0;
+    }
 
-	@Override
+    @Override
     public int getSampleRate()
     {
-		if( mInputStream != null )
-		{
-			return (int)mInputStream.getFormat().getSampleRate();
-		}
-		
-		return 0;
+        if(mInputStream != null)
+        {
+            return (int)mInputStream.getFormat().getSampleRate();
+        }
+
+        return 0;
     }
 
-	/**
-	 * Returns the frequency set for this file.  Normally returns zero, but
-	 * the value can be set with setFrequency() method.
-	 */
+    /**
+     * Returns the frequency set for this file.  Normally returns zero, but
+     * the value can be set with setFrequency() method.
+     */
     public long getFrequency()
     {
-	    return mFrequency;
+        return mFrequency;
     }
 
     /**
      * Changes the value returned from getFrequency() for this source.
      */
-    public void setFrequency( long frequency )
+    public void setFrequency(long frequency)
     {
-    	mFrequency = frequency;
+        mFrequency = frequency;
     }
-    
+
     /**
      * Closes the source file
      */
     public void close() throws IOException
     {
-    	if( mInputStream != null )
-    	{
-        	mInputStream.close();
-    	}
-    	else
-    	{
-    		throw new IOException( "Can't close wave source - was not opened" );
-    	}
-    	
-    	mInputStream = null;
+        if(mInputStream != null)
+        {
+            mInputStream.close();
+        }
+        else
+        {
+            throw new IOException("Can't close wave source - was not opened");
+        }
+
+        mInputStream = null;
     }
 
     /**
@@ -170,126 +183,126 @@ public class RealWaveSource extends RealSource
      */
     public void open() throws IOException, UnsupportedAudioFileException
     {
-    	if( mInputStream == null )
-    	{
-        	mInputStream = AudioSystem.getAudioInputStream( mFile );
-    	}
-    	else
-    	{
-    		throw new IOException( "Can't open wave source - is already opened" );
-    	}
+        if(mInputStream == null)
+        {
+            mInputStream = AudioSystem.getAudioInputStream(mFile);
+        }
+        else
+        {
+            throw new IOException("Can't open wave source - is already opened");
+        }
 
 
         AudioFormat format = mInputStream.getFormat();
-        
+
         mBytesPerFrame = format.getFrameSize();
 
-        if( format.getChannels() != 1 || format.getSampleSizeInBits() != 16 )
+        if(format.getChannels() != 1 || format.getSampleSizeInBits() != 16)
         {
-        	throw new IOException( "Unsupported Wave Format - EXPECTED: 1 " +
-        		"channel 16-bit samples FOUND: " + 
-    			mInputStream.getFormat().getChannels() + " channels " + 
-        		mInputStream.getFormat().getSampleSizeInBits() + "-bit samples" );
+            throw new IOException("Unsupported Wave Format - EXPECTED: 1 " +
+                "channel 16-bit samples FOUND: " +
+                mInputStream.getFormat().getChannels() + " channels " +
+                mInputStream.getFormat().getSampleSizeInBits() + "-bit samples");
         }
         
         /* Broadcast that we're at frame location 0 */
-        broadcast( 0 );
+        broadcast(0);
     }
 
     /**
      * Reads the number of frames and sends a buffer to the listener
      */
-	@Override
-	public void next( int frames ) throws IOException
-	{
-		next( frames, true );
-	}
-
-	/**
-	 * Reads the number of frames and optionally sends the buffer to the listener
-	 */
-    public void next( int frames, boolean broadcast ) throws IOException
+    @Override
+    public void next(int frames) throws IOException
     {
-        if( mInputStream != null )
-        {
-        	byte[] buffer = new byte[ mBytesPerFrame * frames ];
-        	
-        	/* Fill the buffer with samples from the file */
-        	int samplesRead = mInputStream.read( buffer );
-        	
-        	mFrameCounter += samplesRead;
-        	
-        	broadcast( mFrameCounter );
-        	
-        	if( broadcast && mListener != null )
-        	{
-            	if( samplesRead < buffer.length )
-            	{
-            		if( samplesRead == -1 )
-            		{
-            			throw new IOException( "End of recording" );
-            		}
-            		
-            		buffer = Arrays.copyOf( buffer, samplesRead );
-            	}
+        next(frames, true);
+    }
 
-            	float[] samples = ConversionUtils
-            			.convertFromSigned16BitSamples( buffer );
-            	
-            	mListener.receive( new RealBuffer( samples ) );
-        	}
+    /**
+     * Reads the number of frames and optionally sends the buffer to the listener
+     */
+    public void next(int frames, boolean broadcast) throws IOException
+    {
+        if(mInputStream != null)
+        {
+            byte[] buffer = new byte[mBytesPerFrame * frames];
+
+        	/* Fill the buffer with samples from the file */
+            int samplesRead = mInputStream.read(buffer);
+
+            mFrameCounter += samplesRead;
+
+            broadcast(mFrameCounter);
+
+            if(broadcast && mListener != null)
+            {
+                if(samplesRead < buffer.length)
+                {
+                    if(samplesRead == -1)
+                    {
+                        throw new IOException("End of recording");
+                    }
+
+                    buffer = Arrays.copyOf(buffer, samplesRead);
+                }
+
+                float[] samples = ConversionUtils
+                    .convertFromSigned16BitSamples(buffer);
+
+                mListener.receive(new RealBuffer(samples));
+            }
         }
     }
-    
+
     /**
-     * Registers the listener to receive sample buffers as they are read from 
+     * Registers the listener to receive sample buffers as they are read from
      * the wave file
      */
-	@Override
-	public void setListener( Listener<RealBuffer> listener )
-	{
-        mListener = listener;
-	}
-
-	/**
-	 * Unregisters the listener from receiving sample buffers
-	 */
-    public void removeListener( Listener<RealBuffer> listener )
+    @Override
+    public void setListener(Listener<RealBuffer> listener)
     {
-    	mListener = null;
+        mListener = listener;
     }
 
-	@Override
+    /**
+     * Unregisters the listener from receiving sample buffers
+     */
+    public void removeListener(Listener<RealBuffer> listener)
+    {
+        mListener = null;
+    }
+
+    @Override
     public void dispose()
     {
-		mListener = null;
+        mListener = null;
     }
 
-	@Override
-	public File getFile()
-	{
-		return mFile;
-	}
-	
-	private void broadcast( int byteLocation )
-	{
-		int frameLocation = (int)( byteLocation / mBytesPerFrame );
-		
-		if( mFrameLocationListener != null )
-		{
-			mFrameLocationListener.frameLocationUpdated( frameLocation );
-		}
-	}
-	
-	@Override
-	public void setListener( IFrameLocationListener listener )
-	{
-		mFrameLocationListener = listener;
-	}
+    @Override
+    public File getFile()
+    {
+        return mFile;
+    }
 
-	@Override
-	public void removeListener( IFrameLocationListener listener )
-	{
-		mFrameLocationListener = null;
-	}
+    private void broadcast(int byteLocation)
+    {
+        int frameLocation = (int)(byteLocation / mBytesPerFrame);
+
+        if(mFrameLocationListener != null)
+        {
+            mFrameLocationListener.frameLocationUpdated(frameLocation);
+        }
+    }
+
+    @Override
+    public void setListener(IFrameLocationListener listener)
+    {
+        mFrameLocationListener = listener;
+    }
+
+    @Override
+    public void removeListener(IFrameLocationListener listener)
+    {
+        mFrameLocationListener = null;
+    }
 }