#39 WIP - initial efforts to restructure the way tuners and tuner

controllers manager sample buffer processing and channel management.
General cleanup across all modules to remove the executor from each
of the start() methods.  Removed the B100 tuner class since it's not
yet implemented.

src/module/Module.java

@@ -59,9 +59,9 @@ public abstract class Module
 	public abstract void reset();
 
 	/**
-	 * Start processing.  Provides an executor to use for scheduling tasks
+	 * Start processing.
 	 */
-	public abstract void start( ScheduledExecutorService executor );
+	public abstract void start();
 
 	/**
 	 * Stop processing

src/module/ProcessingChain.java

@@ -24,9 +24,9 @@ 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 source.heartbeat.Heartbeat;
+import source.heartbeat.IHeartbeatListener;
+import source.heartbeat.IHeartbeatProvider;
 import channel.metadata.AttributeChangeRequest;
 import channel.metadata.IAttributeChangeRequestListener;
 import channel.metadata.IAttributeChangeRequestProvider;
@@ -454,7 +454,7 @@ public class ProcessingChain implements IChannelEventListener
 
         if(module instanceof IHeartbeatProvider)
         {
-            ((IHeartbeatProvider)module).setHeartbeatListener(mHeartbeatBroadcaster);
+            ((IHeartbeatProvider)module).getHeartbeatManager().addHeartbeatListener(mHeartbeatBroadcaster);
         }
 
         if(module instanceof IMessageProvider)
@@ -521,7 +521,7 @@ public class ProcessingChain implements IChannelEventListener
 
         if(module instanceof IHeartbeatProvider)
         {
-            ((IHeartbeatProvider)module).removeHeartbeatListener();
+            ((IHeartbeatProvider)module).getHeartbeatManager().removeHeartbeatListener(mHeartbeatBroadcaster);
         }
 
         if(module instanceof IMessageProvider)
@@ -595,7 +595,7 @@ public class ProcessingChain implements IChannelEventListener
                 {
                     try
                     {
-                        module.start(ThreadPool.SCHEDULED);
+                        module.start();
                     }
                     catch(Exception e)
                     {

src/module/decode/Decoder.java

@@ -1,19 +1,20 @@
 /*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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/>
+ * 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 module.decode;
 
@@ -22,8 +23,7 @@ import message.Message;
 import module.Module;
 import sample.Listener;
 
-public abstract class Decoder extends Module 
-							  implements IMessageProvider, Listener<Message>
+public abstract class Decoder extends Module implements IMessageProvider, Listener<Message>
 {
 	/* This has to be a broadcaster in order for references to persist */
 	protected Listener<Message> mMessageListener;
@@ -82,4 +82,19 @@ public abstract class Decoder extends Module
 	{
 		broadcast( message );
 	}
+
+	@Override
+	public void reset()
+	{
+	}
+
+	@Override
+	public void start()
+	{
+	}
+
+	@Override
+	public void stop()
+	{
+	}
 }

src/module/decode/fleetsync2/Fleetsync2Decoder.java

@@ -174,19 +174,4 @@ public class Fleetsync2Decoder extends Decoder implements IFilteredRealBufferLis
 	{
 		return mDecimationFilter;
 	}
-
-	@Override
-	public void reset()
-	{
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-	}
-
-	@Override
-	public void stop()
-	{
-	}
 }

src/module/decode/fleetsync2/Fleetsync2DecoderState.java

@@ -63,27 +63,12 @@ public class Fleetsync2DecoderState extends DecoderState
         return DecoderType.FLEETSYNC2;
     }
 
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-
     @Override
     public void dispose()
     {
         super.dispose();
     }
 
-    @Override
-    public void init()
-    {
-    }
-
     /**
      * Resets the overall decoder state and clears any accumulated event details
      */

src/module/decode/lj1200/LJ1200Decoder.java

@@ -192,19 +192,4 @@ public class LJ1200Decoder extends Decoder implements IFilteredRealBufferListene
 	{
 		return mDecimationFilter;
 	}
-
-	@Override
-	public void reset()
-	{
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-	}
-
-	@Override
-	public void stop()
-	{
-	}
 }

src/module/decode/lj1200/LJ1200DecoderState.java

@@ -63,16 +63,6 @@ public class LJ1200DecoderState extends DecoderState
         return DecoderType.LJ_1200;
     }
 
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-
     @Override
     public void receive(Message message)
     {
@@ -125,12 +115,6 @@ public class LJ1200DecoderState extends DecoderState
         return sb.toString();
     }
 
-    @Override
-    public void init()
-    {
-        /* No initialization steps */
-    }
-
     @Override
     public void receiveDecoderStateEvent(DecoderStateEvent event)
     {

src/module/decode/ltrnet/LTRNetDecoder.java

@@ -120,14 +120,4 @@ public class LTRNetDecoder extends Decoder
 	{
 		mLTRMessageFramer.reset();
 	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-	}
-
-	@Override
-	public void stop()
-	{
-	}
 }

src/module/decode/ltrnet/LTRNetDecoderState.java

@@ -765,12 +765,6 @@ public class LTRNetDecoderState extends DecoderState
         }
     }
 
-    @Override
-    public void init()
-    {
-		/* No initialization steps required */
-    }
-
     @Override
     public void receiveDecoderStateEvent(DecoderStateEvent event)
     {
@@ -786,14 +780,4 @@ public class LTRNetDecoderState extends DecoderState
                 break;
         }
     }
-
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-    }
-
-    @Override
-    public void stop()
-    {
-    }
 }

src/module/decode/ltrstandard/LTRStandardDecoder.java

@@ -84,14 +84,4 @@ public class LTRStandardDecoder extends Decoder implements IUnFilteredRealBuffer
 	{
 		mLTRMessageFramer.reset();
 	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-	}
-
-	@Override
-	public void stop()
-	{
-	}
 }

src/module/decode/ltrstandard/LTRStandardDecoderState.java

@@ -76,18 +76,6 @@ public class LTRStandardDecoderState extends DecoderState
         return DecoderType.LTR_STANDARD;
     }
 
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-
     @Override
     public void receive(Message message)
     {
@@ -257,11 +245,6 @@ public class LTRStandardDecoderState extends DecoderState
         }
     }
 
-    @Override
-    public void init()
-    {
-    }
-
     @Override
     public void receiveDecoderStateEvent(DecoderStateEvent event)
     {

src/module/decode/mdc1200/MDCDecoder.java

@@ -202,25 +202,4 @@ public class MDCDecoder extends Decoder implements IFilteredRealBufferListener,
 	{
 		return mDecimationFilter;
 	}
-
-	@Override
-	public void reset()
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void stop()
-	{
-		// TODO Auto-generated method stub
-		
-	}
 }

src/module/decode/mdc1200/MDCDecoderState.java

@@ -59,16 +59,6 @@ public class MDCDecoderState extends DecoderState
         return DecoderType.MDC1200;
     }
 
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-
     @Override
     public void reset()
     {
@@ -245,12 +235,6 @@ public class MDCDecoderState extends DecoderState
         return sb.toString();
     }
 
-    @Override
-    public void init()
-    {
-        /* No initialization required */
-    }
-
     /**
      * Responds to reset events issued by the channel state
      */

src/module/decode/mpt1327/MPT1327Decoder.java

@@ -297,16 +297,4 @@ public class MPT1327Decoder extends Decoder implements IFilteredRealBufferListen
         mControlMessageFramer.reset();
         mTrafficMessageFramer.reset();
     }
-
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-        // TODO Auto-generated method stub
-    }
-
-    @Override
-    public void stop()
-    {
-        // TODO Auto-generated method stub
-    }
 }

src/module/decode/mpt1327/MPT1327DecoderState.java

@@ -87,16 +87,6 @@ public class MPT1327DecoderState extends DecoderState
         return DecoderType.MPT1327;
     }
 
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-
     public ChannelType getChannelType()
     {
         return mChannelType;
@@ -501,12 +491,6 @@ public class MPT1327DecoderState extends DecoderState
         return sb.toString();
     }
 
-    @Override
-    public void init()
-    {
-        /* No initialization required */
-    }
-
     @Override
     public void receiveDecoderStateEvent(DecoderStateEvent event)
     {

src/module/decode/p25/P25DecoderState.java

@@ -221,11 +221,6 @@ public class P25DecoderState extends DecoderState
         return DecoderType.P25_PHASE1;
     }
 
-    @Override
-    public void stop()
-    {
-    }
-
     /**
      * Performs a full reset to prepare this object for reuse on a new channel
      */
@@ -257,14 +252,6 @@ public class P25DecoderState extends DecoderState
         mCurrentCallEvent = null;
     }
 
-    /**
-     * Performs any initialization operations to prepare for use
-     */
-    @Override
-    public void init()
-    {
-    }
-
     /**
      * Indicates if there a call event exists for the specified channel and
      * from and to talkgroup identifiers.
@@ -3624,7 +3611,7 @@ public class P25DecoderState extends DecoderState
     }
 
     @Override
-    public void start(ScheduledExecutorService executor)
+    public void start()
     {
         //Change the default (45-second) traffic channel timeout to 1 second
         if(mChannelType == ChannelType.TRAFFIC)

src/module/decode/p25/P25_C4FMDecoder.java

@@ -194,27 +194,6 @@ public class P25_C4FMDecoder extends P25Decoder implements IFilteredRealBufferLi
 		}
     }
 
-	@Override
-	public void reset()
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void stop()
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
 	@Override
 	public void setSourceEventListener(Listener<SourceEvent> listener )
 	{

src/module/decode/p25/P25_LSMDecoder.java

@@ -237,25 +237,4 @@ public class P25_LSMDecoder extends P25Decoder implements IComplexBufferListener
 							tap.getName() );
 		}
     }
-
-	@Override
-	public void reset()
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void stop()
-	{
-		// TODO Auto-generated method stub
-		
-	}
 }

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

@@ -71,7 +71,7 @@ public class P25AudioModule extends Module implements Listener<Message>, IAudioP
     }
 
     @Override
-    public void start(ScheduledExecutorService executor)
+    public void start()
     {
 
     }

src/module/decode/passport/PassportDecoder.java

@@ -109,14 +109,4 @@ public class PassportDecoder extends Decoder
 	{
 		mPassportMessageFramer.reset();
 	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-	}
-
-	@Override
-	public void stop()
-	{
-	}
 }

src/module/decode/passport/PassportDecoderState.java

@@ -78,21 +78,6 @@ public class PassportDecoderState extends DecoderState
         return DecoderType.PASSPORT;
     }
 
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-    }
-
-    @Override
-    public void init()
-    {
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-
     private void logTalkgroup(String talkgroup)
     {
         if(mTalkgroupsFirstHeard.contains(talkgroup))

src/module/decode/tait/Tait1200Decoder.java

@@ -190,25 +190,4 @@ public class Tait1200Decoder extends Decoder implements IFilteredRealBufferListe
 	{
 		return DecoderType.TAIT_1200;
 	}
-
-	@Override
-	public void reset()
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void stop()
-	{
-		// TODO Auto-generated method stub
-		
-	}
 }

src/module/decode/tait/Tait1200DecoderState.java

@@ -65,16 +65,6 @@ public class Tait1200DecoderState extends DecoderState
         return DecoderType.TAIT_1200;
     }
 
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-
     @Override
     public void reset()
     {
@@ -176,12 +166,6 @@ public class Tait1200DecoderState extends DecoderState
         return sb.toString();
     }
 
-    @Override
-    public void init()
-    {
-        /* No initialization required */
-    }
-
     /**
      * Responds to reset events issued by the channel state
      */

src/module/demodulate/am/AMDemodulatorModule.java

@@ -1,124 +1,110 @@
 /*******************************************************************************
  *     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 module.demodulate.am;
 
-import java.util.concurrent.ScheduledExecutorService;
-
-import module.Module;
-import sample.Listener;
-import sample.complex.ComplexBuffer;
-import sample.complex.IComplexBufferListener;
-import sample.real.IFilteredRealBufferProvider;
-import sample.real.RealBuffer;
 import dsp.am.AMDemodulator_CB;
 import dsp.filter.FilterFactory;
 import dsp.filter.Window.WindowType;
 import dsp.filter.fir.complex.ComplexFIRFilter_CB_CB;
 import dsp.filter.fir.real.RealFIRFilter_RB_RB;
 import dsp.gain.AutomaticGainControl_RB;
+import module.Module;
+import sample.Listener;
+import sample.complex.ComplexBuffer;
+import sample.complex.IComplexBufferListener;
+import sample.real.IFilteredRealBufferProvider;
+import sample.real.RealBuffer;
 
-public class AMDemodulatorModule extends Module 
-					implements IComplexBufferListener, IFilteredRealBufferProvider
+public class AMDemodulatorModule extends Module
+    implements IComplexBufferListener, IFilteredRealBufferProvider
 {
-	private static final int SAMPLE_RATE = 48000;
-	
-	private ComplexFIRFilter_CB_CB mIQFilter;
-	private AMDemodulator_CB mDemodulator;
-	private RealFIRFilter_RB_RB mLowPassFilter;	
+    private static final int SAMPLE_RATE = 48000;
+
+    private ComplexFIRFilter_CB_CB mIQFilter;
+    private AMDemodulator_CB mDemodulator;
+    private RealFIRFilter_RB_RB mLowPassFilter;
     private AutomaticGainControl_RB mAGC;
 
-	/**
-	 * FM Demodulator with integrated DC removal and automatic frequency
-	 * correction control.
-	 * 
-	 * @param pass - pass frequency for IQ filtering prior to demodulation.  This
-	 * frequency should be half of the signal bandwidth since the filter will
-	 * be applied against each of the inphase and quadrature signals and the 
-	 * combined pass bandwidth will be twice this value.
-	 * 
-	 * @param stop - stop frequency for IQ filtering prior to demodulation.
-	 * 
-	 * @param maxFrequencyCorrection - defines the maximum frequency +/- that 
-	 * the correction controller can adjust from the center tuned frequency.
-	 * Set this value to 0 for no frequency correction control.
-	 */
-	public AMDemodulatorModule()
-	{
-		mIQFilter = new ComplexFIRFilter_CB_CB( FilterFactory.getLowPass( 
-			SAMPLE_RATE, 5000, 73, WindowType.HAMMING ), 1.0f );
-		
-		mDemodulator = new AMDemodulator_CB( 500.0f );
-		mIQFilter.setListener( mDemodulator );
+    /**
+     * AM Demodulator Module
+     */
+    public AMDemodulatorModule()
+    {
+        mIQFilter = new ComplexFIRFilter_CB_CB(FilterFactory.getLowPass(
+            SAMPLE_RATE, 5000, 73, WindowType.HAMMING), 1.0f);
 
-		mLowPassFilter = new RealFIRFilter_RB_RB( 
-    		FilterFactory.getLowPass( 48000, 3000, 31, WindowType.COSINE ), 1.0f );
-		mDemodulator.setListener( mLowPassFilter );
-		
-		mAGC = new AutomaticGainControl_RB();
-		mLowPassFilter.setListener( mAGC );
-	}
+        mDemodulator = new AMDemodulator_CB(500.0f);
+        mIQFilter.setListener(mDemodulator);
 
-	@Override
-	public Listener<ComplexBuffer> getComplexBufferListener()
-	{
-		return mIQFilter;
-	}
+        mLowPassFilter = new RealFIRFilter_RB_RB(
+            FilterFactory.getLowPass(48000, 3000, 31, WindowType.COSINE), 1.0f);
+        mDemodulator.setListener(mLowPassFilter);
 
-	@Override
-	public void dispose()
-	{
-		mIQFilter.dispose();
-		mIQFilter = null;
-		
-		mDemodulator.dispose();
-		mDemodulator = null;
-		
-		mLowPassFilter.dispose();
-		mLowPassFilter = null;
-		
-		mAGC.dispose();
-		mAGC = null;
-	}
+        mAGC = new AutomaticGainControl_RB();
+        mLowPassFilter.setListener(mAGC);
+    }
 
-	@Override
-	public void reset()
-	{
-	}
+    @Override
+    public Listener<ComplexBuffer> getComplexBufferListener()
+    {
+        return mIQFilter;
+    }
 
-	@Override
-	public void setFilteredRealBufferListener( Listener<RealBuffer> listener )
-	{
-		mAGC.setListener( listener );
-	}
+    @Override
+    public void dispose()
+    {
+        mIQFilter.dispose();
+        mIQFilter = null;
 
-	@Override
-	public void removeFilteredRealBufferListener()
-	{
-		mAGC.removeListener();
-	}
+        mDemodulator.dispose();
+        mDemodulator = null;
 
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-	}
+        mLowPassFilter.dispose();
+        mLowPassFilter = null;
 
-	@Override
-	public void stop()
-	{
-	}
+        mAGC.dispose();
+        mAGC = null;
+    }
+
+    @Override
+    public void reset()
+    {
+    }
+
+    @Override
+    public void setFilteredRealBufferListener(Listener<RealBuffer> listener)
+    {
+        mAGC.setListener(listener);
+    }
+
+    @Override
+    public void removeFilteredRealBufferListener()
+    {
+        mAGC.removeListener();
+    }
+
+    @Override
+    public void start()
+    {
+    }
+
+    @Override
+    public void stop()
+    {
+    }
 }

src/module/demodulate/audio/DemodulatedAudioFilterModule.java

@@ -97,7 +97,7 @@ public class DemodulatedAudioFilterModule extends Module implements IUnFilteredR
     }
 
     @Override
-    public void start(ScheduledExecutorService executor)
+    public void start()
     {
     }
 

src/module/demodulate/fm/FMDemodulatorModule.java

@@ -104,7 +104,7 @@ public class FMDemodulatorModule extends Module implements IComplexBufferListene
     }
 
     @Override
-    public void start(ScheduledExecutorService executor)
+    public void start()
     {
     }
 

src/module/log/EventLogger.java

@@ -65,7 +65,7 @@ public abstract class EventLogger extends Module
     public abstract String getHeader();
 
     @Override
-    public void start(ScheduledExecutorService executor)
+    public void start()
     {
         if(mLogFile == null)
         {