Skip to content

Commit 5222bff

Browse files
authored
Merge pull request #1808
* Inherit preferred tuner configuration to P25 traffic channels
1 parent 42e7a49 commit 5222bff

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@ private void processPhase1ChannelGrant(APCO25Channel apco25Channel, ServiceOptio
309309
broadcast(event);
310310
SourceConfigTuner sourceConfig = new SourceConfigTuner();
311311
sourceConfig.setFrequency(frequency);
312+
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
313+
{
314+
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
315+
}
312316
trafficChannel.setSourceConfiguration(sourceConfig);
313317
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
314318

@@ -356,6 +360,10 @@ private void processPhase1ChannelGrant(APCO25Channel apco25Channel, ServiceOptio
356360

357361
SourceConfigTuner sourceConfig = new SourceConfigTuner();
358362
sourceConfig.setFrequency(frequency);
363+
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
364+
{
365+
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
366+
}
359367
trafficChannel.setSourceConfiguration(sourceConfig);
360368
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
361369

@@ -455,6 +463,10 @@ else if(timeslot == 1)
455463
broadcast(event);
456464
SourceConfigTuner sourceConfig = new SourceConfigTuner();
457465
sourceConfig.setFrequency(frequency);
466+
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
467+
{
468+
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
469+
}
458470
trafficChannel.setSourceConfiguration(sourceConfig);
459471
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
460472

@@ -517,6 +529,10 @@ else if(timeslot == 1)
517529

518530
SourceConfigTuner sourceConfig = new SourceConfigTuner();
519531
sourceConfig.setFrequency(frequency);
532+
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
533+
{
534+
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
535+
}
520536
trafficChannel.setSourceConfiguration(sourceConfig);
521537
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);
522538

0 commit comments

Comments
 (0)