Merge branch 'master' into develop

robotastic · Jan 1, 2017 · f83a9d3 · f83a9d3
2 parents d0326de + 75d9f8d
commit f83a9d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/trunk-recorder/call.cc b/trunk-recorder/call.cc
@@ -36,6 +36,7 @@ Call::Call(long t, double f, System *s, Config c) {
   tdma            = false;
   encrypted       = false;
   emergency       = false;
+  conventional    = false;
 
   this->create_filename();
 }
@@ -59,6 +60,7 @@ Call::Call(TrunkMessage message, System *s, Config c) {
   tdma            = message.tdma;
   encrypted       = message.encrypted;
   emergency       = message.emergency;
+  conventional    = false;
 
   this->create_filename();
 }

diff --git a/trunk-recorder/main.cc b/trunk-recorder/main.cc
@@ -46,7 +46,6 @@
 #include "systems/p25_parser.h"
 #include "systems/parser.h"
 
-#include "uploaders/conv_uploader.h"
 
 #include <osmosdr/source.h>
 
@@ -425,10 +424,7 @@ void stop_inactive_recorders() {
 
     if (call->is_conventional() && call->get_recorder()) {
       if (call->get_current_length() > 1.0) {                                                                                                                           //
-                                                                                                                                                                        // checks
-                                                                                                                                                                        // to
-                                                                                                                                                                        // see
-                                                                                                                                                                        // if
+                                                                                                                                    // if
                                                                                                                                                                         // any
         BOOST_LOG_TRIVIAL(info) << "Recorder: " <<  call->get_current_length() << " Idle: " << call->get_recorder()->is_idle() << " Count: " << call->get_idle_count(); //
                                                                                                                                                                         // recording