Merge commit '20271c6df57dacbaed3f2255a8230f44f58bd3ae'

Apparently when 1.6.0 was release it was not properly merged. This re-add the disable p25 encryption muting flag.

Conflicts:
	README
	dsd.h
	dsd_main.c
	dsd_symbol.c
	p25p1_ldu1.c
	p25p1_ldu2.c

README.md

@@ -495,10 +495,12 @@ rate and serial port device if necessary.
 -fp           Decode only ProVoice*
 -fr           Decode only DMR/MOTOTRBO
 -fx           Decode only X2-TDMA
+-l            Disable Filters (not recommended)
 -ma           Auto-select modulation optimizations (default)
 -mc           Use only C4FM modulation optimizations
 -mg           Use only GFSK modulation optimizations
 -mq           Use only QPSK modulation optimizations
+-pu           Unmute Encrypted P25
 -u <num>      Unvoiced speech quality (default=3)
 -xx           Expect non-inverted X2-TDMA signal
 -xr           Expect inverted DMR/MOTOTRBO signal

dsd.h

@@ -100,6 +100,7 @@ typedef struct
   int playfiles;
   int delay;
   int use_cosine_filter;
+  int unmute_encrypted_p25;
 } dsd_opts;
 
 typedef struct

dsd_main.c

@@ -129,6 +129,7 @@ initOpts (dsd_opts * opts)
   opts->playfiles = 0;
   opts->delay = 0;
   opts->use_cosine_filter = 1;
+  opts->unmute_encrypted_p25 = 0;
 }
 
 void
@@ -269,6 +270,7 @@ usage ()
   printf ("  -mc           Use only C4FM modulation optimizations\n");
   printf ("  -mg           Use only GFSK modulation optimizations\n");
   printf ("  -mq           Use only QPSK modulation optimizations\n");
+  printf ("  -pu           Unmute Encrypted P25\n");
   printf ("  -u <num>      Unvoiced speech quality (default=3)\n");
   printf ("  -xx           Expect non-inverted X2-TDMA signal\n");
   printf ("  -xr           Expect inverted DMR/MOTOTRBO signal\n");
@@ -376,6 +378,10 @@ main (int argc, char **argv)
             {
               opts.p25tg = 1;
             }
+          else if (optarg[0] == 'u')
+            {
+        	  opts.unmute_encrypted_p25 = 1;
+            }
           break;
         case 'q':
           opts.errorbars = 0;

p25p1_ldu1.c

@@ -77,7 +77,7 @@ processLDU1 (dsd_opts * opts, dsd_state * state)
           y++;
           z++;
         }
-      if (state->p25kid == 0)
+      if (state->p25kid == 0 || opts->unmute_encrypted_p25 == 1)
         {
           processMbeFrame (opts, state, imbe_fr, NULL, NULL);
         }

p25p1_ldu2.c

@@ -80,7 +80,7 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
           y++;
           z++;
         }
-      if (state->p25kid == 0)
+      if (state->p25kid == 0 || opts->unmute_encrypted_p25 == 1)
         {
     	  processMbeFrame (opts, state, imbe_fr, NULL, NULL);
         }