From 0605760fcdd4caf028c0bb645897e5407b254947 Mon Sep 17 00:00:00 2001
From: denny <dennissheirer2002@yahoo.com>
Date: Sun, 13 Mar 2016 07:38:29 -0400
Subject: [PATCH] wip #34 - removed some wrapper methods from tuner since the
 tuner controller is now exposed (frequency, sample rate, channel count, etc)

---
 src/source/tuner/Tuner.java                   | 23 ------------
 src/source/tuner/TunerChannelSource.java      |  8 ++--
 src/source/tuner/TunerController.java         |  5 +++
 src/source/tuner/TunerEditor.java             | 10 +----
 src/source/tuner/TunerModel.java              |  8 ++--
 src/source/tuner/airspy/AirspyTuner.java      | 37 -------------------
 .../tuner/airspy/AirspyTunerController.java   |  2 +-
 src/source/tuner/ettus/B100Tuner.java         | 25 -------------
 src/source/tuner/fcd/FCDTuner.java            | 24 ------------
 src/source/tuner/fcd/FCDTunerController.java  |  3 +-
 .../tuner/fcd/proV1/FCD1TunerController.java  |  4 +-
 .../fcd/proplusV2/FCD2TunerController.java    |  2 +
 src/source/tuner/hackrf/HackRFTuner.java      | 24 ------------
 src/source/tuner/rtl/RTL2832Tuner.java        | 33 -----------------
 .../tuner/rtl/RTL2832TunerController.java     |  2 +-
 src/spectrum/SpectralDisplayPanel.java        | 20 ++++------
 16 files changed, 32 insertions(+), 198 deletions(-)

diff --git a/src/source/tuner/Tuner.java b/src/source/tuner/Tuner.java
index 498d32f5..911a1ca5 100644
--- a/src/source/tuner/Tuner.java
+++ b/src/source/tuner/Tuner.java
@@ -99,12 +99,6 @@ public abstract class Tuner implements ITunerChannelProvider
 		mName = name;
 	}
 	
-	/**
-	 * Applies the settings from a saved tuner configuration setting object
-	 */
-	public abstract void apply( TunerConfiguration config )
-					throws SourceException;
-
 	/**
 	 * Unique identifier for this tuner, used to lookup a tuner configuration
 	 * from the settings manager.
@@ -135,23 +129,11 @@ public abstract class Tuner implements ITunerChannelProvider
 		return mName;
 	}
 
-	/**
-	 * Sample rate of complex data coming from the Tuner
-	 * @return
-	 */
-	public abstract int getSampleRate();
-
 	/**
 	 * Sample size in bits
 	 */
 	public abstract double getSampleSize();
 	
-	/**
-	 * Tuner Local Oscillator Frequency
-	 * @return - frequency in Hertz
-	 */
-	public abstract long getFrequency() throws SourceException;
-
 	/**
 	 * Returns a tuner frequency channel source, tuned to the correct frequency
 	 * 
@@ -166,11 +148,6 @@ public abstract class Tuner implements ITunerChannelProvider
 	public abstract TunerChannelSource getChannel( TunerChannel channel ) 
 			throws RejectedExecutionException, SourceException;
 	
-	/**
-	 * Count of currently sourced channels (TunerChannel).
-	 */
-	public abstract int getChannelCount();
-	
 	/**
 	 * Releases the tuned channel resources
 	 * 
diff --git a/src/source/tuner/TunerChannelSource.java b/src/source/tuner/TunerChannelSource.java
index 748a42fd..66fba403 100644
--- a/src/source/tuner/TunerChannelSource.java
+++ b/src/source/tuner/TunerChannelSource.java
@@ -97,16 +97,18 @@ public class TunerChannelSource extends ComplexSource
 	    
 	    mTunerChannel = tunerChannel;
 
-	    mTunerFrequency = mTuner.getFrequency();
+	    mTunerFrequency = mTuner.getTunerController().getFrequency();
 	    
 	    /* Setup the frequency translator to the current source frequency */
 		long frequencyOffset = mTunerFrequency - mTunerChannel.getFrequency();
 		
-		mMixer = new Oscillator( frequencyOffset, mTuner.getSampleRate() );
+		mMixer = new Oscillator( frequencyOffset, 
+				mTuner.getTunerController().getSampleRate() );
 
 		/* Fire a sample rate change event to setup the decimation chain */
 		frequencyChanged( new FrequencyChangeEvent( 
-			Event.NOTIFICATION_SAMPLE_RATE_CHANGE, mTuner.getSampleRate() ) );
+				Event.NOTIFICATION_SAMPLE_RATE_CHANGE, 
+				mTuner.getTunerController().getSampleRate() ) );
     }
 	
 	
diff --git a/src/source/tuner/TunerController.java b/src/source/tuner/TunerController.java
index 21061552..b0c240aa 100644
--- a/src/source/tuner/TunerController.java
+++ b/src/source/tuner/TunerController.java
@@ -119,6 +119,11 @@ public abstract class TunerController implements Tunable, IFrequencyChangeProces
 	{
 		return mFrequencyController.getFrequency();
 	}
+	
+	public int getSampleRate()
+	{
+		return mFrequencyController.getBandwidth();
+	}
 
 	public double getFrequencyCorrection()
 	{
diff --git a/src/source/tuner/TunerEditor.java b/src/source/tuner/TunerEditor.java
index 0b7f9514..394e8f4e 100644
--- a/src/source/tuner/TunerEditor.java
+++ b/src/source/tuner/TunerEditor.java
@@ -133,14 +133,8 @@ public class TunerEditor extends Editor<Tuner>
 	        tuner.getTunerController().addListener( mFrequencyControl );
 
 	        //Set the displayed frequency without adjusting the tuner's frequency
-	        try
-	        {
-		        mFrequencyControl.setFrequency( tuner.getFrequency(), false );
-	        }
-	        catch( SourceException e )
-	        {
-	        	mLog.debug( "Couldn't get frequency from tuner: " + tuner.getUniqueID() );
-	        }
+	        mFrequencyControl.setFrequency( 
+	        		tuner.getTunerController().getFrequency(), false );
 		}
 		else
 		{
diff --git a/src/source/tuner/TunerModel.java b/src/source/tuner/TunerModel.java
index a4505c61..80086c94 100644
--- a/src/source/tuner/TunerModel.java
+++ b/src/source/tuner/TunerModel.java
@@ -96,7 +96,7 @@ public class TunerModel extends AbstractTableModel implements Listener<TunerEven
 			
 			try
 			{
-				tuner.apply( config );
+				tuner.getTunerController().apply( config );
 				
 				mTuners.add( tuner );
 				
@@ -222,13 +222,13 @@ public class TunerModel extends AbstractTableModel implements Listener<TunerEven
 				case TUNER_TYPE:
 					return tuner.getTunerType().getLabel();
 				case SAMPLE_RATE:
-					int sampleRate = tuner.getSampleRate();
+					int sampleRate = tuner.getTunerController().getSampleRate();
 
 					return mSampleRateFormat.format( sampleRate / 1E6D ) + MHZ;
 				case FREQUENCY:
 					try
 					{
-						long frequency = tuner.getFrequency();
+						long frequency = tuner.getTunerController().getFrequency();
 						
 						return mFrequencyFormat.format( frequency / 1E6D ) + MHZ;
 					}
@@ -237,7 +237,7 @@ public class TunerModel extends AbstractTableModel implements Listener<TunerEven
 						return 0;
 					}
 				case CHANNEL_COUNT:
-					return tuner.getChannelCount();
+					return tuner.getTunerController().getChannelCount();
 				case SPECTRAL_DISPLAY_MAIN:
 					return "Main";
 				case SPECTRAL_DISPLAY_NEW:
diff --git a/src/source/tuner/airspy/AirspyTuner.java b/src/source/tuner/airspy/AirspyTuner.java
index 01a52201..2a77ffc6 100644
--- a/src/source/tuner/airspy/AirspyTuner.java
+++ b/src/source/tuner/airspy/AirspyTuner.java
@@ -48,12 +48,6 @@ public class AirspyTuner extends Tuner
 		return (AirspyTunerController)getTunerController();
 	}
 
-	@Override
-	public void apply( TunerConfiguration config ) throws SourceException
-	{
-		getController().apply( config );
-	}
-
 	@Override
     public String getUniqueID()
     {
@@ -81,35 +75,12 @@ public class AirspyTuner extends Tuner
 		return TunerType.AIRSPY_R820T;
 	}
 
-	@Override
-	public int getSampleRate()
-	{
-		int rate = 0;
-		
-		try
-		{
-			rate = getController().getCurrentSampleRate();
-		} 
-		catch ( SourceException e )
-		{
-			mLog.error( "Error while getting sample rate from controller", e );
-		}
-		
-		return rate;
-	}
-	
 	@Override
 	public double getSampleSize()
 	{
 		return 13.0;
 	}
 
-	@Override
-	public long getFrequency() throws SourceException
-	{
-		return getController().getFrequency();
-	}
-
 	@Override
     public TunerChannelSource getChannel( TunerChannel channel ) 
     		throws RejectedExecutionException, SourceException
@@ -131,14 +102,6 @@ public class AirspyTuner extends Tuner
 		return source;
     }
 	
-	
-
-	@Override
-	public int getChannelCount()
-	{
-		return getController().getChannelCount();
-	}
-
 	@Override
     public void releaseChannel( TunerChannelSource source )
     {
diff --git a/src/source/tuner/airspy/AirspyTunerController.java b/src/source/tuner/airspy/AirspyTunerController.java
index e132e59e..3f1c129d 100644
--- a/src/source/tuner/airspy/AirspyTunerController.java
+++ b/src/source/tuner/airspy/AirspyTunerController.java
@@ -427,7 +427,7 @@ public class AirspyTunerController extends TunerController
 	/**
 	 * Airspy sample rate object that matches the current sample rate setting.
 	 */
-	public AirspySampleRate getSampleRate()
+	public AirspySampleRate getAirspySampleRate()
 	{
 		return getSampleRate( mSampleRate );
 	}
diff --git a/src/source/tuner/ettus/B100Tuner.java b/src/source/tuner/ettus/B100Tuner.java
index b836722a..abdc2964 100644
--- a/src/source/tuner/ettus/B100Tuner.java
+++ b/src/source/tuner/ettus/B100Tuner.java
@@ -68,30 +68,12 @@ public class B100Tuner extends Tuner
 	    return TunerType.ETTUS_WBX;
     }
 
-	@Override
-    public void apply( TunerConfiguration config ) throws SourceException
-    {
-		mLog.error( "B100 Tuner - can't apply tuner configuration" );
-    }
-
-	@Override
-    public int getSampleRate()
-    {
-	    return 0;
-    }
-
 	@Override
 	public double getSampleSize()
 	{
 		return 16.0;
 	}
 
-	@Override
-    public long getFrequency() throws SourceException
-    {
-	    return 0;
-    }
-
 	@Override
     public TunerChannelSource getChannel( TunerChannel channel ) 
     		throws RejectedExecutionException, SourceException
@@ -100,13 +82,6 @@ public class B100Tuner extends Tuner
 	    return null;
     }
 	
-	@Override
-	public int getChannelCount()
-	{
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
 	@Override
     public void releaseChannel( TunerChannelSource source )
     {
diff --git a/src/source/tuner/fcd/FCDTuner.java b/src/source/tuner/fcd/FCDTuner.java
index f051ce7f..9a891471 100644
--- a/src/source/tuner/fcd/FCDTuner.java
+++ b/src/source/tuner/fcd/FCDTuner.java
@@ -73,30 +73,12 @@ public class FCDTuner extends MixerTuner
 	    return getController().getUSBAddress();
     }
 
-	@Override
-    public void apply( TunerConfiguration config )throws SourceException
-    {
-	    getController().apply( config );
-    }
-	
-	@Override
-    public int getSampleRate()
-    {
-	    return (int)mMixerTunerType.getAudioFormat().getSampleRate();
-    }
-	
 	@Override
 	public double getSampleSize()
 	{
 		return 16.0;
 	}
 
-	@Override
-    public long getFrequency() throws SourceException
-    {
-		return getController().getFrequency();
-    }
-
 	@Override
     public TunerChannelSource getChannel( TunerChannel tunerChannel )
     		throws RejectedExecutionException, SourceException
@@ -111,12 +93,6 @@ public class FCDTuner extends MixerTuner
 		return source;
     }
 
-	@Override
-	public int getChannelCount()
-	{
-		return getController().getChannelCount();
-	}
-
 	/**
 	 * Releases the tuned channel so that the tuner controller can tune to
 	 * other frequencies as needed.
diff --git a/src/source/tuner/fcd/FCDTunerController.java b/src/source/tuner/fcd/FCDTunerController.java
index d1fdfd62..b0d8416d 100644
--- a/src/source/tuner/fcd/FCDTunerController.java
+++ b/src/source/tuner/fcd/FCDTunerController.java
@@ -70,6 +70,7 @@ public abstract class FCDTunerController extends TunerController
 	 */
 	public FCDTunerController( Device device, 
 							   DeviceDescriptor descriptor,
+							   int sampleRate,
 							   int minTunableFrequency,
 							   int maxTunableFrequency )
 	{
@@ -77,7 +78,7 @@ public abstract class FCDTunerController extends TunerController
 			   maxTunableFrequency, 
 			   DC_SPIKE_AVOID_BUFFER, 
 			   USABLE_BANDWIDTH_PERCENT );
-
+		mFrequencyController.setSampleRate( sampleRate );
 		mDevice = device;
 		mDeviceDescriptor = descriptor;
 	}
diff --git a/src/source/tuner/fcd/proV1/FCD1TunerController.java b/src/source/tuner/fcd/proV1/FCD1TunerController.java
index 005950b1..27354fc0 100644
--- a/src/source/tuner/fcd/proV1/FCD1TunerController.java
+++ b/src/source/tuner/fcd/proV1/FCD1TunerController.java
@@ -31,6 +31,7 @@ import org.usb4java.DeviceDescriptor;
 
 import settings.SettingsManager;
 import source.SourceException;
+import source.tuner.MixerTunerType;
 import source.tuner.TunerClass;
 import source.tuner.TunerType;
 import source.tuner.configuration.TunerConfiguration;
@@ -60,7 +61,8 @@ public class FCD1TunerController extends FCDTunerController
 	public FCD1TunerController( Device device, DeviceDescriptor descriptor ) 
 	{
 		super( device, 
-			   descriptor, 
+			   descriptor,
+			   (int)MixerTunerType.FUNCUBE_DONGLE_PRO.getAudioFormat().getSampleRate(),
 			   sMINIMUM_TUNABLE_FREQUENCY, 
 			   sMAXIMUM_TUNABLE_FREQUENCY );
 	}
diff --git a/src/source/tuner/fcd/proplusV2/FCD2TunerController.java b/src/source/tuner/fcd/proplusV2/FCD2TunerController.java
index da7520c1..df579ae4 100644
--- a/src/source/tuner/fcd/proplusV2/FCD2TunerController.java
+++ b/src/source/tuner/fcd/proplusV2/FCD2TunerController.java
@@ -29,6 +29,7 @@ import org.usb4java.DeviceDescriptor;
 
 import settings.SettingsManager;
 import source.SourceException;
+import source.tuner.MixerTunerType;
 import source.tuner.TunerClass;
 import source.tuner.TunerType;
 import source.tuner.configuration.TunerConfiguration;
@@ -52,6 +53,7 @@ public class FCD2TunerController extends FCDTunerController
 	{
 		super( device,
 			   descriptor,
+			   (int)MixerTunerType.FUNCUBE_DONGLE_PRO_PLUS.getAudioFormat().getSampleRate(),
 			   sMINIMUM_TUNABLE_FREQUENCY, 
 			   sMAXIMUM_TUNABLE_FREQUENCY );
 	}
diff --git a/src/source/tuner/hackrf/HackRFTuner.java b/src/source/tuner/hackrf/HackRFTuner.java
index 6f00e4bc..b52dd885 100644
--- a/src/source/tuner/hackrf/HackRFTuner.java
+++ b/src/source/tuner/hackrf/HackRFTuner.java
@@ -65,30 +65,12 @@ public class HackRFTuner extends Tuner
 	    return TunerType.HACKRF;
     }
 
-	@Override
-    public void apply( TunerConfiguration config ) throws SourceException
-    {
-		getController().apply( config );
-    }
-
-	@Override
-    public int getSampleRate()
-    {
-	    return getController().getSampleRate();
-    }
-
 	@Override
 	public double getSampleSize()
 	{
 		return 11.0;
 	}
 
-	@Override
-    public long getFrequency() throws SourceException
-    {
-	    return getController().getFrequency();
-    }
-
 	@Override
     public TunerChannelSource getChannel( TunerChannel channel ) 
     		throws RejectedExecutionException, SourceException
@@ -103,12 +85,6 @@ public class HackRFTuner extends Tuner
 		return source;
     }
 
-	@Override
-	public int getChannelCount()
-	{
-		return getController().getChannelCount();
-	}
-
 	@Override
     public void releaseChannel( TunerChannelSource source )
     {
diff --git a/src/source/tuner/rtl/RTL2832Tuner.java b/src/source/tuner/rtl/RTL2832Tuner.java
index ee994ba7..c913dd9e 100644
--- a/src/source/tuner/rtl/RTL2832Tuner.java
+++ b/src/source/tuner/rtl/RTL2832Tuner.java
@@ -81,27 +81,6 @@ public class RTL2832Tuner extends Tuner
 	    return getController().getTunerType();
     }
 	
-	@Override
-    public void apply( TunerConfiguration config ) throws SourceException
-    {
-		getController().apply( config );
-    }
-
-	@Override
-    public int getSampleRate()
-    {
-		try
-		{
-		    return getController().getCurrentSampleRate();
-		}
-		catch( SourceException e )
-		{
-			mLog.error( "RTL2832 Tuner - couldn't get sample rate", e );
-		}
-		
-		return 0;
-    }
-	
 	public void setSampleRate( SampleRate sampleRate ) throws SourceException
 	{
 		try
@@ -123,12 +102,6 @@ public class RTL2832Tuner extends Tuner
 		return 11.0;
 	}
 
-	@Override
-    public long getFrequency() throws SourceException
-    {
-	    return getController().getFrequency();
-    }
-	
 	public void setFrequency( int frequency ) throws SourceException
 	{
 		getController().setFrequency( frequency );
@@ -158,12 +131,6 @@ public class RTL2832Tuner extends Tuner
 		return source;
     }
 	
-	@Override
-	public int getChannelCount()
-	{
-		return getController().getChannelCount();
-	}
-
 	/**
 	 * Releases the tuned channel so that the tuner controller can tune to
 	 * other frequencies as needed.
diff --git a/src/source/tuner/rtl/RTL2832TunerController.java b/src/source/tuner/rtl/RTL2832TunerController.java
index 5efa45d4..ce78fef0 100644
--- a/src/source/tuner/rtl/RTL2832TunerController.java
+++ b/src/source/tuner/rtl/RTL2832TunerController.java
@@ -976,7 +976,7 @@ public abstract class RTL2832TunerController extends TunerController
 		return mSampleRate.getRate();
 	}
 	
-    public int getSampleRate() throws SourceException
+    public int getSampleRateFromTuner() throws SourceException
 	{
         try
         {
diff --git a/src/spectrum/SpectralDisplayPanel.java b/src/spectrum/SpectralDisplayPanel.java
index 8af9c603..dab9ea81 100644
--- a/src/spectrum/SpectralDisplayPanel.java
+++ b/src/spectrum/SpectralDisplayPanel.java
@@ -447,19 +447,13 @@ public class SpectralDisplayPanel extends JPanel
 			
 			//Fire frequency and sample rate change events so that the spectrum
 			//and overlay panels can synchronize
-			try
-            {
-				frequencyChanged( new FrequencyChangeEvent( 
-						Event.NOTIFICATION_FREQUENCY_CHANGE, mTuner.getFrequency() ) );
-				
-				frequencyChanged( new FrequencyChangeEvent( 
-						Event.NOTIFICATION_SAMPLE_RATE_CHANGE, mTuner.getSampleRate() ) );
-            }
-            catch ( SourceException e )
-            {
-            	mLog.info( "DFTProcessor - exception during new tuner setup - "
-            			+ "couldn't get frequency from the tuner", e );
-            }
+			frequencyChanged( new FrequencyChangeEvent( 
+					Event.NOTIFICATION_FREQUENCY_CHANGE, 
+					mTuner.getTunerController().getFrequency() ) );
+			
+			frequencyChanged( new FrequencyChangeEvent( 
+					Event.NOTIFICATION_SAMPLE_RATE_CHANGE, 
+					mTuner.getTunerController().getSampleRate() ) );
 		}
 	}