From 2d3ad985033488ec7a379ce826d4689dc5b4c9a8 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Wed, 17 Nov 2021 06:19:34 -0700
Subject: [PATCH] change: HaveTranscodable{Ambe,Data}

---
 reflector/BMClient.h            | 2 +-
 reflector/DVFramePacket.h       | 2 +-
 reflector/DVLastFramePacket.cpp | 4 +---
 reflector/DVLastFramePacket.h   | 2 +-
 reflector/Packet.h              | 2 +-
 reflector/PacketStream.cpp      | 2 +-
 reflector/URFPeer.h             | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/reflector/BMClient.h b/reflector/BMClient.h
index 5653611..8455e83 100644
--- a/reflector/BMClient.h
+++ b/reflector/BMClient.h
@@ -35,7 +35,7 @@ public:
 	// identity
 	EProtocol GetProtocol(void) const           { return EProtocol::ulx; }
 	int GetProtocolRevision(void) const         { return XLX_PROTOCOL_REVISION_2; }
-	const char *GetProtocolName(void) const     { return "ULX"; }
+	const char *GetProtocolName(void) const     { return "XLX"; }
 	ECodecType GetCodec(void) const             { return ECodecType::dmr; }
 	bool IsPeer(void) const                     { return true; }
 
diff --git a/reflector/DVFramePacket.h b/reflector/DVFramePacket.h
index 8efcc84..2452599 100644
--- a/reflector/DVFramePacket.h
+++ b/reflector/DVFramePacket.h
@@ -55,7 +55,7 @@ public:
 
 	// identity
 	bool IsDvFrame(void) const           { return true; }
-	bool HasTranscodableAmbe(void) const { return true; }
+	bool HasTranscodableData(void) const { return true; }
 
 	// get
 	const STCPacket *GetCodecPacket() const { return &m_TCPack; }
diff --git a/reflector/DVLastFramePacket.cpp b/reflector/DVLastFramePacket.cpp
index 2bbfbd6..31e96ba 100644
--- a/reflector/DVLastFramePacket.cpp
+++ b/reflector/DVLastFramePacket.cpp
@@ -44,9 +44,7 @@ CDvLastFramePacket::CDvLastFramePacket(const uint8_t *ambe, uint16_t sid, uint8_
 
 // urf constructor
 CDvLastFramePacket::CDvLastFramePacket
-(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 type, const uint8_t *codec2, const uint8_t *nonce)
+(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 type, const uint8_t *codec2, const uint8_t *nonce)
 	: CDvFramePacket(sid, dstarpid, dstarambe, dstardvdata, dmrpid, dprspid, dmrambe, dmrsync, type, codec2, nonce)
 {
 }
diff --git a/reflector/DVLastFramePacket.h b/reflector/DVLastFramePacket.h
index c466b0e..796606b 100644
--- a/reflector/DVLastFramePacket.h
+++ b/reflector/DVLastFramePacket.h
@@ -50,5 +50,5 @@ public:
 
 	// identity
 	bool IsLastPacket(void) const        { return true; }
-	bool HasTranscodableAmbe(void) const { return false; }
+	bool HasTranscodableData(void) const { return false; }
 };
diff --git a/reflector/Packet.h b/reflector/Packet.h
index 46a7e8d..6ab5dfa 100644
--- a/reflector/Packet.h
+++ b/reflector/Packet.h
@@ -47,7 +47,7 @@ public:
 	virtual bool IsDvHeader(void) const             { return false; }
 	virtual bool IsDvFrame(void) const              { return false; }
 	virtual bool IsLastPacket(void) const           { return false; }
-	virtual bool HasTranscodableAmbe(void) const    { return false; }
+	virtual bool HasTranscodableData(void) const    { return false; }
 
 	// get
 	virtual bool IsValid(void) const             { return true; }
diff --git a/reflector/PacketStream.cpp b/reflector/PacketStream.cpp
index 4c4e808..3d73728 100644
--- a/reflector/PacketStream.cpp
+++ b/reflector/PacketStream.cpp
@@ -88,7 +88,7 @@ void CPacketStream::Push(std::unique_ptr<CPacket> Packet)
 		m_CodecStream->Lock();
 		{
 			// transcoder ready & frame need transcoding ?
-			if (Packet->HasTranscodableAmbe())
+			if (Packet->HasTranscodableData())
 			{
 				// yes, push packet to trancoder queue
 				// trancoder will push it after transcoding
diff --git a/reflector/URFPeer.h b/reflector/URFPeer.h
index 71d51a7..96b2266 100644
--- a/reflector/URFPeer.h
+++ b/reflector/URFPeer.h
@@ -34,7 +34,7 @@ public:
 
 	// identity
 	EProtocol GetProtocol(void) const       { return EProtocol::ulx; }
-	const char *GetProtocolName(void) const { return "ULX"; }
+	const char *GetProtocolName(void) const { return "XLX"; }
 
 	// revision helper
 	static int GetProtocolRevision(const CVersion &);