Revert "DSheirer#1903 P25 Phase 2 audio - resolves 2-second chopped audio segments (DSheirer#1904)"

See if this fixes the no audio problem I've reported in DSheirer#1915

This reverts commit 2f0419f.

Author: n2ygk

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/harris/isp/UnknownHarrisISPMessage.java

@@ -1,28 +1,26 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+/*******************************************************************************
+ * sdr-trunk
+ * Copyright (C) 2014-2019 Dennis Sheirer
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by  the Free Software Foundation, either version 3 of the License, or  (at your option) any
+ * later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
+ * You should have received a copy of the GNU General Public License  along with this program.
+ * If not, see <http://www.gnu.org/licenses/>
+ *
+ ******************************************************************************/
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.isp;
 
 import io.github.dsheirer.bits.CorrectedBinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -43,7 +41,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" HARRIS **UNRECOGNIZED ISP OPCODE: ").append(getOpcodeNumber());
+        sb.append(" HARRIS **UNRECOGNIZED ISP OPCODE**");
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/harris/osp/UnknownHarrisOSPMessage.java

@@ -1,28 +1,26 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+/*******************************************************************************
+ * sdr-trunk
+ * Copyright (C) 2014-2019 Dennis Sheirer
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by  the Free Software Foundation, either version 3 of the License, or  (at your option) any
+ * later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
+ * You should have received a copy of the GNU General Public License  along with this program.
+ * If not, see <http://www.gnu.org/licenses/>
+ *
+ ******************************************************************************/
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.osp;
 
 import io.github.dsheirer.bits.CorrectedBinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -43,7 +41,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" HARRIS **UNRECOGNIZED OSP OPCODE:").append(getOpcodeNumber());
+        sb.append(" HARRIS **UNRECOGNIZED OSP OPCODE**");
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/motorola/isp/UnknownMotorolaISPMessage.java

@@ -43,7 +43,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" MOTOROLA **UNRECOGNIZED ISP OPCODE: ").append(getOpcodeNumber());
+        sb.append(" MOTOROLA **UNRECOGNIZED ISP OPCODE**");
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/motorola/osp/UnknownMotorolaOSPMessage.java

@@ -1,6 +1,7 @@
 /*
- * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2019 Dennis Sheirer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
+ * *****************************************************************************
  */
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp;
@@ -23,6 +24,7 @@
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -43,7 +45,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" MOTOROLA **UNRECOGNIZED OSP OPCODE: ").append(getOpcodeNumber());
+        sb.append(" MOTOROLA **UNRECOGNIZED OSP OPCODE**");
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/isp/UnknownISPMessage.java

@@ -1,6 +1,7 @@
 /*
- * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2019 Dennis Sheirer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
+ * *****************************************************************************
  */
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.standard.isp;
@@ -23,6 +24,7 @@
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.ISPMessage;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -43,7 +45,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" **UNRECOGNIZED ISP OPCODE: ").append(getOpcodeNumber());
+        sb.append(" **UNRECOGNIZED ISP OPCODE**");
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/UnknownOSPMessage.java

@@ -1,6 +1,7 @@
 /*
- * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2019 Dennis Sheirer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
+ * *****************************************************************************
  */
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.standard.osp;
@@ -23,6 +24,7 @@
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -43,7 +45,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" **UNRECOGNIZED OSP OPCODE: ").append(getOpcodeNumber());
+        sb.append(" **UNRECOGNIZED OSP OPCODE**");
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderState.java

@@ -1458,10 +1458,7 @@ private void processNullInformation(MacMessage message, MacStructure mac)
          * based solely on the null info in the traffic channel.  Ultimately, the existing call event will either be
          * updated by a subsequent call, or removed via the traffic channel teardown.
          */
-        if(message.getMacPduType() != MacPduType.MAC_4_ACTIVE) //Don't change the state when we're in a call
-        {
-            continueState(State.ACTIVE);
-        }
+        continueState(State.ACTIVE);
     }
 
     /**