Converted frequency to long primitive type (from integer) in anticipation of HackRF support which requires frequencies greater than 2.147 GHz, which is the max hertz value that can be represented by an integer primitive.

This commit is contained in:
dennis.sheirer
2014-07-08 14:40:11 +00:00
parent cdf8c730bc
commit 35a2cebe03
51 changed files with 240 additions and 419 deletions

View File

@@ -92,7 +92,7 @@ public class FCDTuner extends MixerTuner
}
@Override
public int getFrequency() throws SourceException
public long getFrequency() throws SourceException
{
return mController.getFrequency();
}

View File

@@ -55,7 +55,6 @@ public abstract class FCDTunerController extends TunerController
private UsbPipe mPipeIn;
private UsbPipe mPipeOut;
private FCDConfiguration mConfiguration = new FCDConfiguration();
private int mSampleRate;
public FCDTunerController( USBTunerDevice device,
int minTunableFrequency,
@@ -147,7 +146,7 @@ public abstract class FCDTunerController extends TunerController
/**
* Sets the actual (uncorrected) device frequency
*/
public void setTunedFrequency( int frequency ) throws SourceException
public void setTunedFrequency( long frequency ) throws SourceException
{
try
{
@@ -163,11 +162,11 @@ public abstract class FCDTunerController extends TunerController
/**
* Gets the actual (uncorrected) device frequency
*/
public int getTunedFrequency() throws SourceException
public long getTunedFrequency() throws SourceException
{
try
{
return (int)send( FCDCommand.APP_GET_FREQUENCY_HZ );
return send( FCDCommand.APP_GET_FREQUENCY_HZ );
}
catch( Exception e )
{

View File

@@ -86,7 +86,7 @@ public class FCD1TunerEditorPanel extends JPanel implements FrequencyChangeListe
}
@Override
public void frequencyChanged( int frequency, int bandwidth )
public void frequencyChanged( long frequency, int bandwidth )
{
//Disregard the bandwidth value, which shouldn't be changing
try

View File

@@ -85,7 +85,7 @@ public class FCD2TunerEditorPanel extends JPanel implements FrequencyChangeListe
}
@Override
public void frequencyChanged( int frequency, int bandwidth )
public void frequencyChanged( long frequency, int bandwidth )
{
//Disregard the bandwidth, which shouldn't be changing
try