Refactoring to use COMPLEX and REAL sample terms throughout

This commit is contained in:
dennis.sheirer
2014-10-31 13:58:20 +00:00
parent 34268f32b3
commit d34abdd2fa
50 changed files with 530 additions and 239 deletions

View File

@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import sample.Listener;
import sample.simplex.SimplexSampleListener;
import sample.real.RealSampleListener;
import source.Source.SampleType;
import alias.AliasList;
import bits.MessageFramer;
@@ -72,11 +72,11 @@ public class Fleetsync2Decoder extends Decoder implements Instrumentable
public Fleetsync2Decoder( AliasList aliasList )
{
super( SampleType.FLOAT );
super( SampleType.REAL );
mDecimationFilter = new FloatHalfBandFilter(
Filters.FIR_HALF_BAND_31T_ONE_EIGHTH_FCO, 1.0002 );
addSimplexSampleListener( mDecimationFilter );
addRealSampleListener( mDecimationFilter );
mBandPassFilter = new FloatFIRFilter(
Filters.FIRBP_1200FSK_24000FS.getCoefficients(), 1.02 );
@@ -116,9 +116,9 @@ public class Fleetsync2Decoder extends Decoder implements Instrumentable
* Returns a float listener interface for connecting this decoder to a
* float stream provider
*/
public SimplexSampleListener getSimplexReceiver()
public RealSampleListener getRealReceiver()
{
return (SimplexSampleListener)mDecimationFilter;
return (RealSampleListener)mDecimationFilter;
}
@Override
@@ -148,7 +148,7 @@ public class Fleetsync2Decoder extends Decoder implements Instrumentable
{
case INSTRUMENT_INPUT:
FloatTap inputTap = (FloatTap)tap;
addSimplexSampleListener( inputTap );
addRealSampleListener( inputTap );
break;
case INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD:
FloatTap bpTap = (FloatTap)tap;
@@ -172,7 +172,7 @@ public class Fleetsync2Decoder extends Decoder implements Instrumentable
{
case INSTRUMENT_INPUT:
FloatTap inputTap = (FloatTap)tap;
removeSimplexListener( inputTap );
removeRealListener( inputTap );
break;
case INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD:
mBandPassFilter.setListener( mFSKDecoder );
@@ -184,7 +184,7 @@ public class Fleetsync2Decoder extends Decoder implements Instrumentable
}
@Override
public void addUnfilteredSimplexSampleListener( SimplexSampleListener listener )
public void addUnfilteredRealSampleListener( RealSampleListener listener )
{
//Not implemented
}