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.Broadcaster;
import sample.simplex.SimplexSampleListener;
import sample.real.RealSampleListener;
import source.Source.SampleType;
import alias.AliasList;
import bits.MessageFramer;
@@ -106,7 +106,7 @@ public class MPT1327Decoder extends Decoder implements Instrumentable
if( mNBFMDemodulator != null )
{
mNBFMDemodulator.addListener( mDCRemovalFilter );
mDCRemovalFilter.setListener( this.getSimplexReceiver() );
mDCRemovalFilter.setListener( this.getRealReceiver() );
}
}
@@ -115,7 +115,7 @@ public class MPT1327Decoder extends Decoder implements Instrumentable
/* Decimation filter - 48000 / 2 = 24000 output */
mDecimationFilter = new FloatHalfBandFilter(
Filters.FIR_HALF_BAND_31T_ONE_EIGHTH_FCO, 1.0002 );
addSimplexSampleListener( mDecimationFilter );
addRealSampleListener( mDecimationFilter );
/* Low pass filter: 2kHz to pass the 1200 & 1800 Hz FSK */
mLowPassFilter = new FloatFIRFilter(
@@ -169,7 +169,7 @@ public class MPT1327Decoder extends Decoder implements Instrumentable
}
@Override
public void addUnfilteredSimplexSampleListener( SimplexSampleListener listener )
public void addUnfilteredRealSampleListener( RealSampleListener listener )
{
if( mNBFMDemodulator != null )
{
@@ -256,7 +256,7 @@ public class MPT1327Decoder extends Decoder implements Instrumentable
}
else
{
addSimplexSampleListener( inputTap );
addRealSampleListener( inputTap );
}
break;
case INSTRUMENT_HB1_FILTER_TO_LOW_PASS:
@@ -292,7 +292,7 @@ public class MPT1327Decoder extends Decoder implements Instrumentable
}
else
{
removeSimplexListener( inputTap );
removeRealListener( inputTap );
}
break;
case INSTRUMENT_HB1_FILTER_TO_LOW_PASS: