Move the call to closeMbeFile() so it only gets invoked when the repe…

…ater sends a TDU packet, not any non-voice packet. Should minimize the annoying effect of files getting randomly split by noise bursts.
alwinhb · Jan 16, 2015 · b85e6cf · b85e6cf
1 parent 455d760
commit b85e6cf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/dmr_data.c b/dmr_data.c
@@ -508,6 +508,10 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
     print_burst = 0;
   }
 
+  if ((bursttype == 1) || (bursttype == 2)) {
+    closeMbeOutFile (opts, state);
+  }
+
   // 2nd half next slot
   for (i = 49; i < 98; i++) {
       dibit = getDibit (opts, state);

diff --git a/dsd_frame.c b/dsd_frame.c
@@ -147,11 +147,18 @@ processFrame (dsd_opts * opts, dsd_state * state)
           }
           processDMRvoice (opts, state);
       } else {
-          closeMbeOutFile (opts, state);
           state->err_str[0] = 0;
           processDMRdata (opts, state);
       }
       return;
+  } else if ((state->synctype >= 2) && (state->synctype <= 5)) {
+      if ((state->synctype == 3) || (state->synctype == 4)) {
+          //processX2TDMAvoice (opts, state);
+      } else {
+          state->err_str[0] = 0;
+          processX2TDMAData (opts, state);
+      }
+      return;
   } else {
       unsigned char duid = get_p25_nac_and_duid(opts, state);
       printf("p25 NAC: 0x%03x, DUID: 0x%x\n", state->nac, duid);