mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 08:37:25 -05:00
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:
@@ -167,7 +167,7 @@ public class ConfigurationControllerModel extends DefaultTreeModel
|
||||
* Convenience method to add a new default system, site and channel to
|
||||
* the tree
|
||||
*/
|
||||
public void createChannel( int frequency, DecoderType decoder )
|
||||
public void createChannel( long frequency, DecoderType decoder )
|
||||
{
|
||||
System system = new System();
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ public abstract class CallEvent
|
||||
|
||||
public abstract int getChannel();
|
||||
|
||||
public abstract int getFrequency();
|
||||
public abstract long getFrequency();
|
||||
|
||||
public static String getCSVHeader()
|
||||
{
|
||||
|
||||
@@ -23,7 +23,6 @@ import java.util.LinkedList;
|
||||
|
||||
import javax.swing.table.AbstractTableModel;
|
||||
|
||||
import log.Log;
|
||||
import sample.Broadcaster;
|
||||
import sample.Listener;
|
||||
|
||||
|
||||
@@ -829,7 +829,7 @@ public class Channel extends Configuration
|
||||
* Indicates if any part of this channel is contained within the
|
||||
* minimum and maximum frequency values.
|
||||
*/
|
||||
public boolean isWithin( int minimum, int maximum )
|
||||
public boolean isWithin( long minimum, long maximum )
|
||||
{
|
||||
return getTunerChannel() != null &&
|
||||
getTunerChannel().isWithin( minimum, maximum );
|
||||
|
||||
@@ -94,7 +94,7 @@ public class ChannelMap
|
||||
mName = name;
|
||||
}
|
||||
|
||||
public int getFrequency( int channelNumber )
|
||||
public long getFrequency( int channelNumber )
|
||||
{
|
||||
for( ChannelRange range: mRanges )
|
||||
{
|
||||
|
||||
@@ -56,7 +56,7 @@ public class ChannelRange
|
||||
return mFirst <= channel && channel <= mLast;
|
||||
}
|
||||
|
||||
public int getFrequency( int channel )
|
||||
public long getFrequency( int channel )
|
||||
{
|
||||
if( hasChannel( channel ) )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user