Updates decoder types to specify channel sample rate and pass/stop
frequencies for requested channels.  Updates tuner channel source
managers to accept a channel specification for channels that are
allocated.
This commit is contained in:
Denny
2018-09-09 09:49:05 -04:00
parent 9950e46e5a
commit b15a3e59a0
14 changed files with 177 additions and 120 deletions

View File

@@ -21,6 +21,7 @@ import io.github.dsheirer.source.Source;
import io.github.dsheirer.source.SourceException;
import io.github.dsheirer.source.config.SourceConfigTuner;
import io.github.dsheirer.source.tuner.TunerEvent.Event;
import io.github.dsheirer.source.tuner.channel.ChannelSpecification;
import io.github.dsheirer.source.tuner.channel.TunerChannel;
import io.github.dsheirer.source.tuner.channel.TunerChannelSource;
import io.github.dsheirer.source.tuner.configuration.TunerConfiguration;
@@ -327,7 +328,7 @@ public class TunerModel extends AbstractTableModel implements Listener<TunerEven
*
* Returns null if no tuner can source the channel
*/
public Source getSource(SourceConfigTuner config, int bandwidth)
public Source getSource(SourceConfigTuner config, int bandwidth, ChannelSpecification channelSpecification)
{
TunerChannelSource retVal = null;
@@ -347,7 +348,7 @@ public class TunerModel extends AbstractTableModel implements Listener<TunerEven
{
try
{
retVal = tuner.getChannelSourceManager().getSource(tunerChannel);
retVal = tuner.getChannelSourceManager().getSource(tunerChannel, channelSpecification);
if(retVal != null)
{
@@ -370,7 +371,7 @@ public class TunerModel extends AbstractTableModel implements Listener<TunerEven
try
{
retVal = tuner.getChannelSourceManager().getSource(tunerChannel);
retVal = tuner.getChannelSourceManager().getSource(tunerChannel, channelSpecification);
}
catch(Exception e)
{