WIP #34 - updates tuners and tuner model to provide details on

frequency, sample rate, sourced channels, and spectral display in the
tuner view tab.

src/source/tuner/Tuner.java

@@ -17,6 +17,8 @@
  ******************************************************************************/
 package source.tuner;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.RejectedExecutionException;
 
@@ -32,7 +34,6 @@ import source.SourceException;
 import source.tuner.frequency.FrequencyChangeEvent;
 import source.tuner.frequency.FrequencyChangeEvent.Event;
 import source.tuner.frequency.IFrequencyChangeProcessor;
-import controller.ThreadPoolManager;
 
 /**
  * Tuner - provides tuner channel sources, representing a channel frequency
@@ -48,12 +49,15 @@ public abstract class Tuner implements IFrequencyChangeProcessor,
 	 * Sample Listeners - these will typically be the DFT processor for spectral
 	 * display, or it will be one or more tuner channel sources
 	 */
-	protected CopyOnWriteArrayList<Listener<ComplexBuffer>> 
-		mSampleListeners = new CopyOnWriteArrayList<Listener<ComplexBuffer>>();
+	protected List<Listener<ComplexBuffer>> mSampleListeners = 
+			new CopyOnWriteArrayList<>();
 	
-	protected CopyOnWriteArrayList<IFrequencyChangeProcessor> 
-		mFrequencyChangeProcessors = new CopyOnWriteArrayList<IFrequencyChangeProcessor>();
+	protected List<IFrequencyChangeProcessor> mFrequencyChangeProcessors = 
+			new CopyOnWriteArrayList<>();
 
+	protected List<Listener<TunerChangeEvent>> mTunerChangeListeners =
+			new ArrayList<>();
+	
 	public Tuner( String name )
 	{
 		mName = name;
@@ -148,6 +152,11 @@ public abstract class Tuner implements IFrequencyChangeProcessor,
 	public abstract TunerChannelSource getChannel( TunerChannel channel ) 
 			throws RejectedExecutionException, SourceException;
 	
+	/**
+	 * Count of currently sourced channels (TunerChannel).
+	 */
+	public abstract int getChannelCount();
+	
 	/**
 	 * Releases the tuned channel resources
 	 * 
@@ -211,6 +220,33 @@ public abstract class Tuner implements IFrequencyChangeProcessor,
 				new FrequencyChangeEvent( Event.NOTIFICATION_FREQUENCY_CHANGE, frequency ) );
     }
 
+	/**
+	 * Registers the listener
+	 */
+    public void addTunerChangeListener( Listener<TunerChangeEvent> listener )
+    {
+		mTunerChangeListeners.add( listener );
+    }
+
+	/**
+	 * Removes the registered listener
+	 */
+    public void removeTunerChangeListener( Listener<TunerChangeEvent> listener )
+    {
+	    mTunerChangeListeners.remove( listener );
+    }
+
+    /**
+     * Broadcasts the tuner change event
+     */
+    public void broadcast( TunerChangeEvent event )
+    {
+    	for( Listener<TunerChangeEvent> listener: mTunerChangeListeners )
+    	{
+    		listener.receive( event );
+    	}
+    }
+    
     /**
      * Broadcasts a sample rate change event to all registered listeners
      */
@@ -238,6 +274,15 @@ public abstract class Tuner implements IFrequencyChangeProcessor,
     	{
     		processor.frequencyChanged( event );
     	}
+    	
+    	if( event.getEvent() == Event.NOTIFICATION_FREQUENCY_CHANGE )
+    	{
+        	broadcast( new TunerChangeEvent( this, TunerChangeEvent.Event.FREQUENCY ) );
+    	}
+    	else if( event.getEvent() == Event.NOTIFICATION_SAMPLE_RATE_CHANGE )
+    	{
+        	broadcast( new TunerChangeEvent( this, TunerChangeEvent.Event.SAMPLE_RATE ) );
+    	}
     }
 
     /**

src/source/tuner/TunerChangeEvent.java

@@ -0,0 +1,33 @@
+package source.tuner;
+
+public class TunerChangeEvent
+{
+	private Tuner mTuner;
+	private Event mEvent;
+	
+	public TunerChangeEvent( Tuner tuner, Event event )
+	{
+		mTuner = tuner;
+		mEvent = event;
+	}
+	
+	public Tuner getTuner()
+	{
+		return mTuner;
+	}
+
+	public Event getEvent()
+	{
+		return mEvent;
+	}
+	
+	public enum Event
+	{
+		ADD,
+		REMOVE,
+		CHANNEL_COUNT,
+		FREQUENCY,
+		SAMPLE_RATE,
+		SPECTRAL_DISPLAY;
+	}
+}

src/source/tuner/TunerController.java

@@ -221,6 +221,11 @@ public abstract class TunerController implements Tunable
 
 		return source;
 	}
+	
+	public int getChannelCount()
+	{
+		return mTunedChannels.size();
+	}
 
 	/**
 	 * Indicates if the tuner's LO frequency must be updated in order to 

src/source/tuner/TunerType.java

@@ -19,7 +19,7 @@ package source.tuner;
 
 public enum TunerType
 {
-	AIRSPY_R820T( "R820T" ),
+	AIRSPY_R820T( "R820T/R820T2" ),
 	ELONICS_E4000( "E4000" ),
 	ETTUS_WBX( "WBX" ),
 	ETTUS_VARIOUS( "Ettus Tuner" ),

src/source/tuner/airspy/AirspyTuner.java

@@ -29,6 +29,7 @@ import sample.complex.ComplexBuffer;
 import settings.SettingsManager;
 import source.SourceException;
 import source.tuner.Tuner;
+import source.tuner.TunerChangeEvent;
 import source.tuner.TunerChannel;
 import source.tuner.TunerChannelSource;
 import source.tuner.TunerClass;
@@ -137,8 +138,23 @@ public class AirspyTuner extends Tuner
 		//Consider implementing a fractional resampler to get a correct 48 kHz
 		//output sample rate
 		
-	    return mController.getChannel( this, channel );
+		TunerChannelSource source = mController.getChannel( this, channel );
+
+		if( source != null )
+		{
+			broadcast( new TunerChangeEvent( this, TunerChangeEvent.Event.CHANNEL_COUNT ) );
+		}
+		
+		return source;
     }
+	
+	
+
+	@Override
+	public int getChannelCount()
+	{
+		return mController.getChannelCount();
+	}
 
 	@Override
     public void releaseChannel( TunerChannelSource source )

src/source/tuner/ettus/B100Tuner.java

@@ -105,6 +105,13 @@ public class B100Tuner extends Tuner
 		//TODO: pass this call to the tuner controller
 	    return null;
     }
+	
+	@Override
+	public int getChannelCount()
+	{
+		// TODO Auto-generated method stub
+		return 0;
+	}
 
 	@Override
     public void releaseChannel( TunerChannelSource source )

src/source/tuner/fcd/FCDTuner.java

@@ -28,6 +28,7 @@ import settings.SettingsManager;
 import source.SourceException;
 import source.tuner.MixerTuner;
 import source.tuner.MixerTunerDataLine;
+import source.tuner.TunerChangeEvent;
 import source.tuner.TunerChannel;
 import source.tuner.TunerChannelSource;
 import source.tuner.TunerClass;
@@ -113,9 +114,22 @@ public class FCDTuner extends MixerTuner
     public TunerChannelSource getChannel( TunerChannel tunerChannel )
     		throws RejectedExecutionException, SourceException
     {
-		return mController.getChannel( this, tunerChannel );
+		TunerChannelSource source = mController.getChannel( this, tunerChannel );
+
+		if( source != null )
+		{
+			broadcast( new TunerChangeEvent( this, TunerChangeEvent.Event.CHANNEL_COUNT ) );
+		}
+		
+		return source;
     }
 
+	@Override
+	public int getChannelCount()
+	{
+		return mController.getChannelCount();
+	}
+
 	/**
 	 * Releases the tuned channel so that the tuner controller can tune to
 	 * other frequencies as needed.

src/source/tuner/hackrf/HackRFTuner.java

@@ -29,6 +29,7 @@ import sample.complex.ComplexBuffer;
 import settings.SettingsManager;
 import source.SourceException;
 import source.tuner.Tuner;
+import source.tuner.TunerChangeEvent;
 import source.tuner.TunerChannel;
 import source.tuner.TunerChannelSource;
 import source.tuner.TunerClass;
@@ -108,9 +109,22 @@ public class HackRFTuner extends Tuner
     public TunerChannelSource getChannel( TunerChannel channel ) 
     		throws RejectedExecutionException, SourceException
     {
-	    return mController.getChannel( this, channel );
+		TunerChannelSource source = mController.getChannel( this, channel );
+
+		if( source != null )
+		{
+			broadcast( new TunerChangeEvent( this, TunerChangeEvent.Event.CHANNEL_COUNT ) );
+		}
+		
+		return source;
     }
 
+	@Override
+	public int getChannelCount()
+	{
+		return mController.getChannelCount();
+	}
+
 	@Override
     public void releaseChannel( TunerChannelSource source )
     {

src/source/tuner/rtl/RTL2832Tuner.java

@@ -30,6 +30,7 @@ import sample.complex.ComplexBuffer;
 import settings.SettingsManager;
 import source.SourceException;
 import source.tuner.Tuner;
+import source.tuner.TunerChangeEvent;
 import source.tuner.TunerChannel;
 import source.tuner.TunerChannelSource;
 import source.tuner.TunerClass;
@@ -157,6 +158,11 @@ public class RTL2832Tuner extends Tuner
 		try
 		{
 			source = mController.getChannel( this, channel );
+
+			if( source != null )
+			{
+				broadcast( new TunerChangeEvent( this, TunerChangeEvent.Event.CHANNEL_COUNT ) );
+			}
 		}
 		catch( Exception e )
 		{
@@ -165,6 +171,13 @@ public class RTL2832Tuner extends Tuner
 		
 		return source;
     }
+	
+	@Override
+	public int getChannelCount()
+	{
+		return mController.getChannelCount();
+	}
+
 	/**
 	 * Releases the tuned channel so that the tuner controller can tune to
 	 * other frequencies as needed.