Changed FrequencyChangeListener interface to an event so that I could describe what event was causing the frequency change and to broadcast frequency and sample rate error values.

R820T - added a couple more sample rate settings to the enum and modified the periodic sample rate info logger.

src/dsp/afc/AutomaticFrequencyControl.java

@@ -1,7 +1,9 @@
 package dsp.afc;
 
 import sample.Listener;
+import source.tuner.FrequencyChangeEvent;
 import source.tuner.FrequencyChangeListener;
+import source.tuner.FrequencyChangeEvent.Attribute;
 import buffer.FloatAveragingBuffer;
 
 public class AutomaticFrequencyControl implements Listener<Float>, 
@@ -22,15 +24,14 @@ public class AutomaticFrequencyControl implements Listener<Float>,
 	private int mSkipThreshold = 4;
 	private int mErrorCorrection = 0;
 	private long mCurrentFrequency;
-	private int mCurrentSampleRate;
-	private FrequencyErrorListener mListener;
+	private FrequencyChangeListener mListener;
 	
 	public enum Mode
 	{
 		NORMAL,FAST;
 	}
 	
-	public AutomaticFrequencyControl( FrequencyErrorListener listener )
+	public AutomaticFrequencyControl( FrequencyChangeListener listener )
 	{
 		mListener = listener;
 	}
@@ -57,7 +58,9 @@ public class AutomaticFrequencyControl implements Listener<Float>,
 	{
 		if( mListener != null )
 		{
-			mListener.setError( mErrorCorrection );
+			mListener.frequencyChanged( 
+				new FrequencyChangeEvent( Attribute.FREQUENCY_ERROR, 
+										  mErrorCorrection ) );
 		}
 	}
 
@@ -156,14 +159,23 @@ public class AutomaticFrequencyControl implements Listener<Float>,
 	}
 
 	@Override
-    public void frequencyChanged( long frequency, int bandwidth )
+    public void frequencyChanged( FrequencyChangeEvent event )
     {
-		if( mCurrentFrequency != frequency || mCurrentSampleRate != bandwidth )
+		switch( event.getAttribute() )
 		{
-			mCurrentFrequency = frequency;
-			mCurrentSampleRate = bandwidth;
-			
-			reset();
+			case FREQUENCY:
+				int frequency = (int)event.getValue();
+				
+				if( mCurrentFrequency != frequency )
+				{
+					mCurrentFrequency = frequency;
+					
+					reset();
+				}
+			case SAMPLE_RATE_ERROR:
+				break;
+			default:
+				break;
 		}
     }
 }

src/dsp/afc/FrequencyErrorListener.java

@@ -1,10 +0,0 @@
-package dsp.afc;
-
-import source.tuner.FrequencyChangeListener;
-
-public interface FrequencyErrorListener
-{
-	public void setError( int error );
-	
-	public void addListener( FrequencyChangeListener listener );
-}

src/dsp/filter/FilterFactory.java

@@ -406,7 +406,15 @@ public class FilterFactory
 			
 			int decimate = (int)( sampleRate / decimatedRate );
 			
-			filters[ 0 ] = new ComplexCICDecimate( decimate, 2, decimatedRate );
+//			if( decimate < 25 )
+//			{
+				filters[ 0 ] = new ComplexCICDecimate( decimate, 1, decimatedRate );
+//			}
+//			else
+//			{
+//				filters[ 0 ] = new ComplexCICDecimate( decimate, 3, decimatedRate );
+//			}
+			
 
 //			int finalStopFrequency = decimatedRate - passFrequency;
 //