Work in progress.

-Started work on new channel editor channel viewer/controller
-Removed a number of unused buffer package classes
-Moved automatic frequency control to be a module and removed special
handling
-Added IUnfilteredRealBufferListener & Provider interfaces
-Completely removed the ResourceManager class

src/source/tuner/airspy/AirspyTuner.java

@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
 
 import sample.Listener;
 import sample.complex.ComplexBuffer;
+import settings.SettingsManager;
 import source.SourceException;
 import source.tuner.Tuner;
 import source.tuner.TunerChannel;
@@ -34,7 +35,6 @@ import source.tuner.TunerClass;
 import source.tuner.TunerConfiguration;
 import source.tuner.TunerType;
 import source.tuner.airspy.AirspyTunerController.BoardID;
-import controller.ResourceManager;
 import controller.ThreadPoolManager;
 
 public class AirspyTuner extends Tuner
@@ -55,9 +55,9 @@ public class AirspyTuner extends Tuner
 	}
 	
 	@Override
-	public JPanel getEditor( ResourceManager resourceManager )
+	public JPanel getEditor( SettingsManager settingsManager )
 	{
-		return new AirspyTunerEditorPanel( this, resourceManager );
+		return new AirspyTunerEditorPanel( this, settingsManager );
 	}
 	
 	public AirspyTunerController getController()

src/source/tuner/airspy/AirspyTunerConfigurationPanel.java

@@ -45,13 +45,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usb4java.LibUsbException;
 
+import settings.SettingsManager;
 import source.SourceException;
 import source.tuner.TunerConfiguration;
 import source.tuner.TunerConfigurationAssignment;
 import source.tuner.TunerType;
 import source.tuner.airspy.AirspyTunerController.Gain;
 import source.tuner.airspy.AirspyTunerController.GainMode;
-import controller.ResourceManager;
 
 public class AirspyTunerConfigurationPanel extends JPanel
 {
@@ -60,7 +60,7 @@ public class AirspyTunerConfigurationPanel extends JPanel
 
 	private static final long serialVersionUID = 1L;
     
-    private ResourceManager mResourceManager;
+    private SettingsManager mSettingsManager;
     private AirspyTunerController mController;
     private AirspyTunerConfiguration mSelectedConfig;
 
@@ -94,10 +94,10 @@ public class AirspyTunerConfigurationPanel extends JPanel
     private JSlider mMixerGain;
     
     
-    public AirspyTunerConfigurationPanel( ResourceManager resourceManager,
+    public AirspyTunerConfigurationPanel( SettingsManager settingsManager,
     								      AirspyTunerController controller )
     {
-    	mResourceManager = resourceManager;
+    	mSettingsManager = settingsManager;
     	mController = controller;
     	
     	init();
@@ -126,8 +126,7 @@ public class AirspyTunerConfigurationPanel extends JPanel
         
         if( serial != null )
         {
-            savedConfig = mResourceManager
-            		.getSettingsManager().getSelectedTunerConfiguration( 
+            savedConfig = mSettingsManager.getSelectedTunerConfiguration( 
     				TunerType.AIRSPY_R820T, serial );
         }
         
@@ -146,8 +145,7 @@ public class AirspyTunerConfigurationPanel extends JPanel
         	
         	if( serial != null )
         	{
-            	mResourceManager.getSettingsManager()
-        		.setSelectedTunerConfiguration( TunerType.AIRSPY_R820T, 
+            	mSettingsManager.setSelectedTunerConfiguration( TunerType.AIRSPY_R820T, 
     				serial, mSelectedConfig );
         	}
         }
@@ -518,8 +516,7 @@ public class AirspyTunerConfigurationPanel extends JPanel
             public void actionPerformed( ActionEvent e )
             {
 				TunerConfiguration config = 
-						mResourceManager.getSettingsManager()
-							.addNewTunerConfiguration( 
+						mSettingsManager.addNewTunerConfiguration( 
 									TunerType.AIRSPY_R820T, 
 									"New Configuration" );
 				
@@ -558,8 +555,7 @@ public class AirspyTunerConfigurationPanel extends JPanel
 
 					if( n == JOptionPane.YES_OPTION )
 					{
-						mResourceManager.getSettingsManager()
-							.deleteTunerConfiguration( selected );
+						mSettingsManager.deleteTunerConfiguration( selected );
 
 						mComboConfigurations.setModel( getModel() );
 						
@@ -635,7 +631,7 @@ public class AirspyTunerConfigurationPanel extends JPanel
         	mGainModeCombo.setSelectedItem( Gain.getGainMode( gain ) );
 	        mGain.setValue( gain.getValue() );
 	        
-	        mResourceManager.getSettingsManager().setSelectedTunerConfiguration( 
+	        mSettingsManager.setSelectedTunerConfiguration( 
 			TunerType.AIRSPY_R820T, mController.getDeviceInfo().getSerialNumber(), config );
 	        
 	        save();
@@ -661,8 +657,7 @@ public class AirspyTunerConfigurationPanel extends JPanel
     private ComboBoxModel<AirspyTunerConfiguration> getModel()
     {
     	ArrayList<TunerConfiguration> configs = 
-    			mResourceManager.getSettingsManager()
-    			.getTunerConfigurations( TunerType.AIRSPY_R820T );
+			mSettingsManager.getTunerConfigurations( TunerType.AIRSPY_R820T );
     	
     	DefaultComboBoxModel<AirspyTunerConfiguration> model = 
     			new DefaultComboBoxModel<AirspyTunerConfiguration>();
@@ -681,8 +676,7 @@ public class AirspyTunerConfigurationPanel extends JPanel
     private AirspyTunerConfiguration getNamedConfiguration( String name )
     {
     	ArrayList<TunerConfiguration> configs = 
-    			mResourceManager.getSettingsManager()
-    			.getTunerConfigurations( TunerType.AIRSPY_R820T );
+    			mSettingsManager.getTunerConfigurations( TunerType.AIRSPY_R820T );
     	
     	for( TunerConfiguration config: configs )
     	{
@@ -700,6 +694,6 @@ public class AirspyTunerConfigurationPanel extends JPanel
      */
     private void save()
     {
-    	mResourceManager.getSettingsManager().save();
+    	mSettingsManager.save();
     }
 }

src/source/tuner/airspy/AirspyTunerEditorPanel.java

@@ -29,17 +29,16 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import settings.SettingsManager;
 import source.SourceException;
 import source.tuner.frequency.FrequencyChangeEvent;
 import source.tuner.frequency.FrequencyChangeEvent.Event;
-import source.tuner.frequency.FrequencyChangeListener;
+import source.tuner.frequency.IFrequencyChangeProcessor;
 
 import com.jidesoft.swing.JideTabbedPane;
 
-import controller.ResourceManager;
-
 public class AirspyTunerEditorPanel extends JPanel 
-						implements FrequencyChangeListener
+						implements IFrequencyChangeProcessor
 {
     private static final long serialVersionUID = 1L;
 
@@ -50,14 +49,14 @@ public class AirspyTunerEditorPanel extends JPanel
     
     private AirspyTuner mTuner;
     private AirspyTunerController mController;
-    private ResourceManager mResourceManager;
+    private SettingsManager mSettingsManager;
 
 	public AirspyTunerEditorPanel( AirspyTuner tuner, 
-								   ResourceManager resourceManager )
+								   SettingsManager settingsManager )
 	{
 		mTuner = tuner;
 		mController = mTuner.getController();
-		mResourceManager = resourceManager;
+		mSettingsManager = settingsManager;
 		
 		initGUI();
 	}
@@ -76,7 +75,7 @@ public class AirspyTunerEditorPanel extends JPanel
         
         /* Add frequency control as frequency change listener.  This creates a
          * feedback loop, so the control does not rebroadcast the event */
-        mTuner.addListener( mFrequencyControl );
+        mTuner.addFrequencyChangeProcessor( mFrequencyControl );
         
         mFrequencyControl.setFrequency( mController.getFrequency(), false );
 
@@ -89,7 +88,7 @@ public class AirspyTunerEditorPanel extends JPanel
         add( tabs, "span,grow,push" );
         
         tabs.add( "Config", new AirspyTunerConfigurationPanel( 
-        		mResourceManager, mTuner.getController() ) );
+        		mSettingsManager, mTuner.getController() ) );
         
         tabs.add( "Info", new AirspyInformationPanel( mTuner.getController() ) ); 
     }
@@ -97,7 +96,7 @@ public class AirspyTunerEditorPanel extends JPanel
 	@Override
     public void frequencyChanged( FrequencyChangeEvent event )
     {
-		if( event.getEvent() == Event.FREQUENCY_CHANGE_NOTIFICATION )
+		if( event.getEvent() == Event.NOTIFICATION_FREQUENCY_CHANGE )
 		{
 			try
 	        {