GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 09:07:27 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Refactoring to use COMPLEX and REAL sample terms throughout

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dsp/nbfm/FMDiscriminator.java
View File

@@ -19,11 +19,11 @@ package dsp.nbfm;
import sample.Listener;
import sample.complex.ComplexSample;
import sample.simplex.SimplexSampleListener;
import sample.real.RealSampleListener;
public class FMDiscriminator implements Listener<ComplexSample>
{
private SimplexSampleListener mListener;
private RealSampleListener mListener;
private ComplexSample mPreviousSample = new ComplexSample( 0.0f, 0.0f );
private double mGain;
@@ -94,7 +94,7 @@ public class FMDiscriminator implements Listener<ComplexSample>
mPreviousSample = currentSample;
}
public void setListener( SimplexSampleListener listener )
public void setListener( RealSampleListener listener )
{
mListener = listener;
}

10
src/dsp/nbfm/FilteringNBFMDemodulator.java
View File

@@ -19,8 +19,8 @@ package dsp.nbfm;
import sample.Listener;
import sample.complex.ComplexSample;
import sample.simplex.SimplexSampleBroadcaster;
import sample.simplex.SimplexSampleListener;
import sample.real.RealSampleBroadcaster;
import sample.real.RealSampleListener;
import dsp.filter.ComplexFIRFilter;
import dsp.filter.FilterFactory;
import dsp.filter.FloatFIRFilter;
@@ -28,7 +28,7 @@ import dsp.filter.Window.WindowType;
public class FilteringNBFMDemodulator implements Listener<ComplexSample>
{
private SimplexSampleBroadcaster mBroadcaster = new SimplexSampleBroadcaster();
private RealSampleBroadcaster mBroadcaster = new RealSampleBroadcaster();
private ComplexFIRFilter mIQFilter;
private FloatFIRFilter mAudioFilter;
private FMDiscriminator mDiscriminator;
@@ -78,7 +78,7 @@ public class FilteringNBFMDemodulator implements Listener<ComplexSample>
/**
* Adds a listener to receive demodulated samples
*/
public void addListener( SimplexSampleListener listener )
public void addListener( RealSampleListener listener )
{
mBroadcaster.addListener( listener );
}
@@ -86,7 +86,7 @@ public class FilteringNBFMDemodulator implements Listener<ComplexSample>
/**
* Removes a listener from receiving demodulated samples
*/
public void removeListener( SimplexSampleListener listener )
public void removeListener( RealSampleListener listener )
{
mBroadcaster.removeListener( listener );
}

10
src/dsp/nbfm/NBFMDemodulator.java
View File

@@ -19,15 +19,15 @@ package dsp.nbfm;
import sample.Listener;
import sample.complex.ComplexSample;
import sample.simplex.SimplexSampleBroadcaster;
import sample.simplex.SimplexSampleListener;
import sample.real.RealSampleBroadcaster;
import sample.real.RealSampleListener;
import dsp.filter.ComplexFIRFilter;
import dsp.filter.FilterFactory;
import dsp.filter.Window.WindowType;
public class NBFMDemodulator implements Listener<ComplexSample>
{
private SimplexSampleBroadcaster mBroadcaster = new SimplexSampleBroadcaster();
private RealSampleBroadcaster mBroadcaster = new RealSampleBroadcaster();
private ComplexFIRFilter mIQFilter;
private FMDiscriminator mDiscriminator;
@@ -78,7 +78,7 @@ public class NBFMDemodulator implements Listener<ComplexSample>
/**
* Adds a listener to receive demodulated samples
*/
public void addListener( SimplexSampleListener listener )
public void addListener( RealSampleListener listener )
{
mBroadcaster.addListener( listener );
}
@@ -86,7 +86,7 @@ public class NBFMDemodulator implements Listener<ComplexSample>
/**
* Removes a listener from receiving demodulated samples
*/
public void removeListener( SimplexSampleListener listener )
public void removeListener( RealSampleListener listener )
{
mBroadcaster.removeListener( listener );
}