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/hackrf/HackRFTuner.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.hackrf.HackRFTunerController.BoardID;
-import controller.ResourceManager;
 import controller.ThreadPoolManager;
 
 public class HackRFTuner extends Tuner
@@ -76,9 +76,9 @@ public class HackRFTuner extends Tuner
     }
 
 	@Override
-    public JPanel getEditor( ResourceManager resourceManager )
+    public JPanel getEditor( SettingsManager settingsManager )
     {
-	    return new HackRFTunerEditorPanel( this, resourceManager );
+	    return new HackRFTunerEditorPanel( this, settingsManager );
     }
 
 	@Override

src/source/tuner/hackrf/HackRFTunerConfigurationPanel.java

@@ -48,6 +48,7 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import settings.SettingsManager;
 import source.SourceException;
 import source.tuner.TunerConfiguration;
 import source.tuner.TunerConfigurationAssignment;
@@ -55,7 +56,6 @@ import source.tuner.TunerType;
 import source.tuner.hackrf.HackRFTunerController.HackRFLNAGain;
 import source.tuner.hackrf.HackRFTunerController.HackRFSampleRate;
 import source.tuner.hackrf.HackRFTunerController.HackRFVGAGain;
-import controller.ResourceManager;
 
 public class HackRFTunerConfigurationPanel extends JPanel
 {
@@ -64,7 +64,7 @@ public class HackRFTunerConfigurationPanel extends JPanel
 
 	private static final long serialVersionUID = 1L;
     
-    private ResourceManager mResourceManager;
+    private SettingsManager mSettingsManager;
     private HackRFTunerController mController;
     private HackRFTunerConfiguration mSelectedConfig;
 
@@ -81,10 +81,10 @@ public class HackRFTunerConfigurationPanel extends JPanel
     
     private JComboBox<HackRFSampleRate> mComboSampleRate;
     
-    public HackRFTunerConfigurationPanel( ResourceManager resourceManager,
+    public HackRFTunerConfigurationPanel( SettingsManager settingsManager,
     							 		  HackRFTunerController controller )
     {
-    	mResourceManager = resourceManager;
+    	mSettingsManager = settingsManager;
     	mController = controller;
     	
     	init();
@@ -119,8 +119,7 @@ public class HackRFTunerConfigurationPanel extends JPanel
         
         if( serial != null )
         {
-            savedConfig = mResourceManager
-            		.getSettingsManager().getSelectedTunerConfiguration( 
+            savedConfig = mSettingsManager.getSelectedTunerConfiguration( 
     				TunerType.HACKRF, serial );
         }
         
@@ -139,7 +138,7 @@ public class HackRFTunerConfigurationPanel extends JPanel
         	
         	if( serial != null )
         	{
-            	mResourceManager.getSettingsManager()
+            	mSettingsManager
         		.setSelectedTunerConfiguration( TunerType.HACKRF, 
     				serial, mSelectedConfig );
         	}
@@ -418,7 +417,7 @@ public class HackRFTunerConfigurationPanel extends JPanel
             public void actionPerformed( ActionEvent e )
             {
 				TunerConfiguration config = 
-						mResourceManager.getSettingsManager()
+						mSettingsManager
 							.addNewTunerConfiguration( 
 									TunerType.HACKRF, 
 									"New Configuration" );
@@ -458,7 +457,7 @@ public class HackRFTunerConfigurationPanel extends JPanel
 
 					if( n == JOptionPane.YES_OPTION )
 					{
-						mResourceManager.getSettingsManager()
+						mSettingsManager
 							.deleteTunerConfiguration( selected );
 
 						mComboConfigurations.setModel( getModel() );
@@ -494,7 +493,7 @@ public class HackRFTunerConfigurationPanel extends JPanel
 
 	        mComboSampleRate.setSelectedItem( mSelectedConfig.getSampleRate() );
 
-	        mResourceManager.getSettingsManager().setSelectedTunerConfiguration( 
+	        mSettingsManager.setSelectedTunerConfiguration( 
 			TunerType.HACKRF, mController.getSerial().getSerialNumber(), config );
         }
         catch ( UsbException | SourceException e1 )
@@ -518,7 +517,7 @@ public class HackRFTunerConfigurationPanel extends JPanel
     private ComboBoxModel<HackRFTunerConfiguration> getModel()
     {
     	ArrayList<TunerConfiguration> configs = 
-    			mResourceManager.getSettingsManager()
+    			mSettingsManager
     			.getTunerConfigurations( TunerType.HACKRF );
     	
     	DefaultComboBoxModel<HackRFTunerConfiguration> model = 
@@ -538,7 +537,7 @@ public class HackRFTunerConfigurationPanel extends JPanel
     private HackRFTunerConfiguration getNamedConfiguration( String name )
     {
     	ArrayList<TunerConfiguration> configs = 
-    			mResourceManager.getSettingsManager()
+    			mSettingsManager
     			.getTunerConfigurations( TunerType.HACKRF );
     	
     	for( TunerConfiguration config: configs )
@@ -557,6 +556,6 @@ public class HackRFTunerConfigurationPanel extends JPanel
      */
     private void save()
     {
-    	mResourceManager.getSettingsManager().save();
+    	mSettingsManager.save();
     }
 }

src/source/tuner/hackrf/HackRFTunerEditorPanel.java

@@ -30,18 +30,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.FrequencyChangeListener;
 import source.tuner.frequency.FrequencyChangeEvent.Event;
+import source.tuner.frequency.IFrequencyChangeProcessor;
 import source.tuner.hackrf.HackRFTunerController.BoardID;
 
 import com.jidesoft.swing.JideTabbedPane;
 
-import controller.ResourceManager;
-
-public class HackRFTunerEditorPanel extends JPanel 
-						implements FrequencyChangeListener
+public class HackRFTunerEditorPanel extends JPanel implements IFrequencyChangeProcessor
 {
     private static final long serialVersionUID = 1L;
 
@@ -52,14 +50,14 @@ public class HackRFTunerEditorPanel extends JPanel
     
     private HackRFTuner mTuner;
     private HackRFTunerController mController;
-    private ResourceManager mResourceManager;
+    private SettingsManager mSettingsManager;
 
 	public HackRFTunerEditorPanel( HackRFTuner tuner, 
-								   ResourceManager resourceManager )
+								   SettingsManager resourceManager )
 	{
 		mTuner = tuner;
 		mController = mTuner.getController();
-		mResourceManager = resourceManager;
+		mSettingsManager = resourceManager;
 		
 		initGUI();
 	}
@@ -89,7 +87,7 @@ public class HackRFTunerEditorPanel 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 );
 
@@ -102,7 +100,7 @@ public class HackRFTunerEditorPanel extends JPanel
         add( tabs, "span,grow,push" );
         
         tabs.add( "Config", new HackRFTunerConfigurationPanel( 
-        		mResourceManager, mTuner.getController() ) );
+        		mSettingsManager, mTuner.getController() ) );
         
         tabs.add( "Info", new HackRFInformationPanel( mTuner.getController() ) ); 
     }
@@ -110,7 +108,7 @@ public class HackRFTunerEditorPanel extends JPanel
 	@Override
     public void frequencyChanged( FrequencyChangeEvent event )
     {
-		if( event.getEvent() == Event.FREQUENCY_CHANGE_NOTIFICATION )
+		if( event.getEvent() == Event.NOTIFICATION_FREQUENCY_CHANGE )
 		{
 			try
 	        {