aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Berndt <lukekb@gmail.com>2021-12-15 20:23:16 -0500
committerLuke Berndt <lukekb@gmail.com>2021-12-15 20:23:16 -0500
commit49013db556abee27f4ce1bd1f7056494773075ed (patch)
tree87de21f0d06a4d477825873323cc1b69ca8fe705
parent5798d993afbdabdd49fbf4298d1d6477fecdd51e (diff)
Update main.ccv4.2.2
-rwxr-xr-xtrunk-recorder/main.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/trunk-recorder/main.cc b/trunk-recorder/main.cc
index 237d959d..2ca2f409 100755
--- a/trunk-recorder/main.cc
+++ b/trunk-recorder/main.cc
@@ -602,13 +602,7 @@ void process_signal(long unitId, const char *signaling_type, gr::blocks::SignalT
bool start_recorder(Call *call, TrunkMessage message, System *sys) {
Talkgroup *talkgroup = sys->find_talkgroup(call->get_talkgroup());
- int priority = talkgroup->get_priority();
- BOOST_FOREACH (auto& TGID, sys->get_talkgroup_patch(call->get_talkgroup())) {
- if (sys->find_talkgroup(TGID)->get_priority() < priority){
- priority = sys->find_talkgroup(TGID)->get_priority();
- BOOST_LOG_TRIVIAL(info) << "Temporarily increased priority of talkgroup " << call->get_talkgroup() << " to " << sys->find_talkgroup(TGID)->get_priority() << " due to active patch with talkgroup " << TGID;
- }
- }
+
bool source_found = false;
bool recorder_found = false;
Recorder *recorder;
@@ -643,6 +637,13 @@ bool start_recorder(Call *call, TrunkMessage message, System *sys) {
source_found = true;
if (talkgroup) {
+ int priority = talkgroup->get_priority();
+ BOOST_FOREACH (auto& TGID, sys->get_talkgroup_patch(call->get_talkgroup())) {
+ if (sys->find_talkgroup(TGID)->get_priority() < priority){
+ priority = sys->find_talkgroup(TGID)->get_priority();
+ BOOST_LOG_TRIVIAL(info) << "Temporarily increased priority of talkgroup " << call->get_talkgroup() << " to " << sys->find_talkgroup(TGID)->get_priority() << " due to active patch with talkgroup " << TGID;
+ }
+ }
if (talkgroup->mode.compare("A") == 0) {
recorder = source->get_analog_recorder(talkgroup);
call->set_is_analog(true);