mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-19 20:17:25 -05:00
Merge pull request #1808
* Inherit preferred tuner configuration to P25 traffic channels
This commit is contained in:
@@ -309,6 +309,10 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I
|
|||||||
broadcast(event);
|
broadcast(event);
|
||||||
SourceConfigTuner sourceConfig = new SourceConfigTuner();
|
SourceConfigTuner sourceConfig = new SourceConfigTuner();
|
||||||
sourceConfig.setFrequency(frequency);
|
sourceConfig.setFrequency(frequency);
|
||||||
|
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
|
||||||
|
{
|
||||||
|
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
|
||||||
|
}
|
||||||
trafficChannel.setSourceConfiguration(sourceConfig);
|
trafficChannel.setSourceConfiguration(sourceConfig);
|
||||||
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
|
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
|
||||||
|
|
||||||
@@ -356,6 +360,10 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I
|
|||||||
|
|
||||||
SourceConfigTuner sourceConfig = new SourceConfigTuner();
|
SourceConfigTuner sourceConfig = new SourceConfigTuner();
|
||||||
sourceConfig.setFrequency(frequency);
|
sourceConfig.setFrequency(frequency);
|
||||||
|
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
|
||||||
|
{
|
||||||
|
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
|
||||||
|
}
|
||||||
trafficChannel.setSourceConfiguration(sourceConfig);
|
trafficChannel.setSourceConfiguration(sourceConfig);
|
||||||
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
|
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
|
||||||
|
|
||||||
@@ -455,6 +463,10 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I
|
|||||||
broadcast(event);
|
broadcast(event);
|
||||||
SourceConfigTuner sourceConfig = new SourceConfigTuner();
|
SourceConfigTuner sourceConfig = new SourceConfigTuner();
|
||||||
sourceConfig.setFrequency(frequency);
|
sourceConfig.setFrequency(frequency);
|
||||||
|
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
|
||||||
|
{
|
||||||
|
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
|
||||||
|
}
|
||||||
trafficChannel.setSourceConfiguration(sourceConfig);
|
trafficChannel.setSourceConfiguration(sourceConfig);
|
||||||
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
|
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
|
||||||
|
|
||||||
@@ -517,6 +529,10 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I
|
|||||||
|
|
||||||
SourceConfigTuner sourceConfig = new SourceConfigTuner();
|
SourceConfigTuner sourceConfig = new SourceConfigTuner();
|
||||||
sourceConfig.setFrequency(frequency);
|
sourceConfig.setFrequency(frequency);
|
||||||
|
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
|
||||||
|
{
|
||||||
|
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
|
||||||
|
}
|
||||||
trafficChannel.setSourceConfiguration(sourceConfig);
|
trafficChannel.setSourceConfiguration(sourceConfig);
|
||||||
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
|
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user