From 5222bffce4f739230c5e69f99010a1d39693283b Mon Sep 17 00:00:00 2001 From: Moto Date: Tue, 30 Jan 2024 01:05:19 -0800 Subject: [PATCH] Merge pull request #1808 * Inherit preferred tuner configuration to P25 traffic channels --- .../decode/p25/P25TrafficChannelManager.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java b/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java index 5018f079..6e668be7 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java @@ -309,6 +309,10 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I broadcast(event); SourceConfigTuner sourceConfig = new SourceConfigTuner(); sourceConfig.setFrequency(frequency); + if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner) + { + sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner()); + } trafficChannel.setSourceConfiguration(sourceConfig); mAllocatedTrafficChannelMap.put(frequency, trafficChannel); @@ -356,6 +360,10 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I SourceConfigTuner sourceConfig = new SourceConfigTuner(); sourceConfig.setFrequency(frequency); + if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner) + { + sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner()); + } trafficChannel.setSourceConfiguration(sourceConfig); mAllocatedTrafficChannelMap.put(frequency, trafficChannel); @@ -455,6 +463,10 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I broadcast(event); SourceConfigTuner sourceConfig = new SourceConfigTuner(); sourceConfig.setFrequency(frequency); + if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner) + { + sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner()); + } trafficChannel.setSourceConfiguration(sourceConfig); mAllocatedTrafficChannelMap.put(frequency, trafficChannel); @@ -517,6 +529,10 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I SourceConfigTuner sourceConfig = new SourceConfigTuner(); sourceConfig.setFrequency(frequency); + if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner) + { + sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner()); + } trafficChannel.setSourceConfiguration(sourceConfig); mAllocatedTrafficChannelMap.put(frequency, trafficChannel);