cleanup of voice packets

reflector/DVFramePacket.cpp

@@ -20,9 +20,7 @@
 #include <string.h>
 #include "DVFramePacket.h"
 
-////////////////////////////////////////////////////////////////////////////////////////
+// default constructor
-// constructor
-
 CDvFramePacket::CDvFramePacket()
 {
 	memset(m_TCPack.dstar, 0, 9);
@@ -35,7 +33,6 @@ CDvFramePacket::CDvFramePacket()
 };
 
 // dstar constructor
-
 CDvFramePacket::CDvFramePacket(const SDStarFrame *dvframe, uint16_t sid, uint8_t pid)
 	: CPacket(sid, pid)
 {
@@ -49,7 +46,6 @@ CDvFramePacket::CDvFramePacket(const SDStarFrame *dvframe, uint16_t sid, uint8_t
 }
 
 // dmr constructor
-
 CDvFramePacket::CDvFramePacket(const uint8_t *ambe, const uint8_t *sync, uint16_t sid, uint8_t pid, uint8_t spid, bool islast)
 	: CPacket(sid, pid, spid, islast)
 {
@@ -63,7 +59,6 @@ CDvFramePacket::CDvFramePacket(const uint8_t *ambe, const uint8_t *sync, uint16_
 }
 
 // ysf constructor
-
 CDvFramePacket::CDvFramePacket(const uint8_t *ambe, uint16_t sid, uint8_t pid, uint8_t spid, uint8_t fid, bool islast)
 	: CPacket(sid, pid, spid, fid, islast)
 {
@@ -76,12 +71,9 @@ CDvFramePacket::CDvFramePacket(const uint8_t *ambe, uint16_t sid, uint8_t pid, u
 	m_TCPack.codec_in = ECodecType::dmr;
 }
 
-// xlx constructor
+// bm constructor
-
 CDvFramePacket::CDvFramePacket
-(uint16_t sid,
+(uint16_t sid, uint8_t dstarpid, const uint8_t *dstarambe, const uint8_t *dstardvdata, uint8_t dmrpid, uint8_t dprspid, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType codecInType, bool islast)
- uint8_t dstarpid, const uint8_t *dstarambe, const uint8_t *dstardvdata,
- uint8_t dmrpid, uint8_t dprspid, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType codecInType, bool islast)
 	: CPacket(sid, dstarpid, dmrpid, dprspid, 0xFF, 0xFF, 0xFF, codecInType, islast)
 {
 	::memcpy(m_TCPack.dstar, dstarambe, 9);
@@ -91,22 +83,7 @@ CDvFramePacket::CDvFramePacket
 	m_TCPack.codec_in = codecInType;
 }
 
-// urf constructor
+// m17 constructor
-
-CDvFramePacket::CDvFramePacket
-(uint16_t sid,
- uint8_t dstarpid, const uint8_t *dstarambe, const uint8_t *dstardvdata,
- uint8_t dmrpid, uint8_t dprspid, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType codecInType, const uint8_t *codec2, const uint8_t * nonce, bool islast)
-	: CPacket(sid, dstarpid, dmrpid, dprspid, 0xFF, 0xFF, 0xFF, codecInType, islast)
-{
-	memcpy(m_TCPack.dstar, dstarambe, 9);
-	memcpy(m_uiDvData, dstardvdata, 3);
-	memcpy(m_TCPack.dmr, dmrambe, 9);
-	memcpy(m_uiDvSync, dmrsync, 7);
-	memcpy(m_TCPack.m17, codec2, 16);
-	memcpy(m_Nonce, nonce, 14);
-	m_TCPack.codec_in = codecInType;
-}
 
 CDvFramePacket::CDvFramePacket(const CM17Packet &m17) : CPacket(m17)
 {

reflector/DVFramePacket.h

@@ -48,8 +48,7 @@ public:
 	CDvFramePacket(const uint8_t *ambe, uint16_t streamid, uint8_t counter1, uint8_t counter2, uint8_t counter3, bool islast);
 	// XLX Frame
 	CDvFramePacket(uint16_t streamid, uint8_t counter, const uint8_t *ambe, const uint8_t *dvdata, uint8_t counter1, uint8_t counter2, const uint8_t *ambe2, const uint8_t *dmrsync, ECodecType type, bool islast);
-	// URF Frame
+	// M17 Frame
-	CDvFramePacket(uint16_t streamid, uint8_t dstarcounter, const uint8_t *dstarambe, const uint8_t *dvdata, uint8_t dmrcounter1, uint8_t dmrcounter2, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType type, const uint8_t *m17codec, const uint8_t *nonce, bool islast);
 	CDvFramePacket(const CM17Packet &m17);
 
 	// virtual duplication

reflector/Packet.cpp

@@ -19,11 +19,7 @@
 #include "Main.h"
 #include "Packet.h"
 
-
+// default constructor
-
-////////////////////////////////////////////////////////////////////////////////////////
-// constructor
-
 CPacket::CPacket()
 {
 	m_uiStreamId = 0;
@@ -41,7 +37,6 @@ CPacket::CPacket()
 };
 
 // dstar contrsuctor
-
 CPacket::CPacket(uint16_t sid, uint8_t dstarpid)
 {
 	m_uiStreamId = sid;
@@ -59,7 +54,6 @@ CPacket::CPacket(uint16_t sid, uint8_t dstarpid)
 };
 
 // dmr constructor
-
 CPacket::CPacket(uint16_t sid, uint8_t dmrpid, uint8_t dmrspid, bool lastpacket)
 {
 	m_uiStreamId = sid;
@@ -77,7 +71,6 @@ CPacket::CPacket(uint16_t sid, uint8_t dmrpid, uint8_t dmrspid, bool lastpacket)
 };
 
 // ysf constructor
-
 CPacket::CPacket(uint16_t sid, uint8_t ysfpid, uint8_t ysfsubpid, uint8_t ysffrid, bool lastpacket)
 {
 	m_uiStreamId = sid;
@@ -94,8 +87,7 @@ CPacket::CPacket(uint16_t sid, uint8_t ysfpid, uint8_t ysfsubpid, uint8_t ysffri
 	m_bLastPacket = lastpacket;
 }
 
-// xlx  constructor
+// bm  constructor
-
 CPacket::CPacket(uint16_t sid, uint8_t dstarpid, uint8_t dmrpid, uint8_t dmrsubpid, uint8_t ysfpid, uint8_t ysfsubpid, uint8_t ysffrid, ECodecType codecIn, bool lastpacket)
 {
 	m_uiStreamId = sid;
@@ -113,7 +105,6 @@ CPacket::CPacket(uint16_t sid, uint8_t dstarpid, uint8_t dmrpid, uint8_t dmrsubp
 }
 
 // m17 constructor
-
 CPacket::CPacket(const CM17Packet &m17) : CPacket()
 {
 	m_uiStreamId = m17.GetStreamId();

reflector/Packet.h

@@ -20,7 +20,7 @@
 
 // Origin Id
 
-#include "Defines.h"
+#include "TCPacketDef.h"
 #include "M17Packet.h"
 
 enum class EOrigin { local, peer };

reflector/TCPacketDef.h

@@ -18,12 +18,10 @@
 
 #include <cstdint>
 
-enum class ECodecType { none, dstar, dmr, c2_1600, c2_3200 };
+enum class ECodecType : std::uint8_t { none = 0, dstar = 1, dmr = 2, c2_1600 = 3, c2_3200 = 4 };
 
 using STCPacket = struct tcpacket_tag {
 	char module;
-	bool is_last_packet;
-	uint16_t streamid;
 	ECodecType codec_in;
 	uint8_t dstar[9];
 	uint8_t dmr[9];

reflector/UnixDgramSocket.h

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <sys/un.h>
 
-#include "Defines.h"
+#include "TCPacketDef.h"
 
 class CUnixDgramReader
 {