From 776752527b1d6673314051a4ab2455036ea5ef8f Mon Sep 17 00:00:00 2001 From: Tom Early Date: Mon, 6 Dec 2021 07:29:31 -0700 Subject: [PATCH] removed C*Client::GetCodec --- reflector/BMClient.h | 1 - reflector/Client.h | 1 - reflector/DCSClient.h | 1 - reflector/DExtraClient.h | 1 - reflector/DMRMMDVMClient.h | 1 - reflector/DMRPlusClient.h | 1 - reflector/DPlusClient.h | 1 - reflector/G3Client.h | 1 - reflector/M17Client.h | 1 + reflector/PacketStream.cpp | 2 +- reflector/URFClient.h | 1 - reflector/YSFClient.h | 1 - 12 files changed, 2 insertions(+), 11 deletions(-) diff --git a/reflector/BMClient.h b/reflector/BMClient.h index 17ceb6b..e25eab6 100644 --- a/reflector/BMClient.h +++ b/reflector/BMClient.h @@ -35,7 +35,6 @@ public: EProtocol GetProtocol(void) const { return EProtocol::xlx; } EProtoRev GetProtocolRevision(void) const { return EProtoRev::ambe; } const char *GetProtocolName(void) const { return "XLX"; } - ECodecType GetCodec(void) const { return ECodecType::dmr; } bool IsPeer(void) const { return true; } // status diff --git a/reflector/Client.h b/reflector/Client.h index ec66e11..9032ad4 100644 --- a/reflector/Client.h +++ b/reflector/Client.h @@ -55,7 +55,6 @@ public: // identity virtual EProtocol GetProtocol(void) const { return EProtocol::none; } virtual EProtoRev GetProtocolRevision(void) const { return EProtoRev::ambe; } - virtual ECodecType GetCodec(void) const { return ECodecType::none; } virtual const char *GetProtocolName(void) const { return "none"; } virtual bool IsNode(void) const { return false; } virtual bool IsPeer(void) const { return false; } diff --git a/reflector/DCSClient.h b/reflector/DCSClient.h index fd6c43b..09d00dd 100644 --- a/reflector/DCSClient.h +++ b/reflector/DCSClient.h @@ -34,7 +34,6 @@ public: // identity EProtocol GetProtocol(void) const { return EProtocol::dcs; } const char *GetProtocolName(void) const { return "DCS"; } - ECodecType GetCodec(void) const { return ECodecType::dstar; } bool IsNode(void) const { return true; } // status diff --git a/reflector/DExtraClient.h b/reflector/DExtraClient.h index 8777fee..dd6dab1 100644 --- a/reflector/DExtraClient.h +++ b/reflector/DExtraClient.h @@ -42,7 +42,6 @@ public: EProtocol GetProtocol(void) const { return EProtocol::dextra; } EProtoRev GetProtocolRevision(void) const { return m_ProtRev; } const char *GetProtocolName(void) const { return "DExtra"; } - ECodecType GetCodec(void) const { return ECodecType::dstar; } bool IsNode(void) const { return true; } // status diff --git a/reflector/DMRMMDVMClient.h b/reflector/DMRMMDVMClient.h index 70a6964..d3c7cec 100644 --- a/reflector/DMRMMDVMClient.h +++ b/reflector/DMRMMDVMClient.h @@ -34,7 +34,6 @@ public: // identity EProtocol GetProtocol(void) const { return EProtocol::dmrmmdvm; } const char *GetProtocolName(void) const { return "DMRMmdvm"; } - ECodecType GetCodec(void) const { return ECodecType::dmr; } bool IsNode(void) const { return true; } // status diff --git a/reflector/DMRPlusClient.h b/reflector/DMRPlusClient.h index cef37ec..e0e284c 100644 --- a/reflector/DMRPlusClient.h +++ b/reflector/DMRPlusClient.h @@ -34,7 +34,6 @@ public: // identity EProtocol GetProtocol(void) const { return EProtocol::dmrplus; } const char *GetProtocolName(void) const { return "DMRplus"; } - ECodecType GetCodec(void) const { return ECodecType::dmr; } bool IsNode(void) const { return true; } // status diff --git a/reflector/DPlusClient.h b/reflector/DPlusClient.h index e0ef901..4c7bb6e 100644 --- a/reflector/DPlusClient.h +++ b/reflector/DPlusClient.h @@ -34,7 +34,6 @@ public: // identity EProtocol GetProtocol(void) const { return EProtocol::dplus; } const char *GetProtocolName(void) const { return "DPlus"; } - ECodecType GetCodec(void) const { return ECodecType::dstar; } bool IsNode(void) const { return true; } bool IsDextraDongle(void) const { return m_bDextraDongle; } void SetDextraDongle(void) { m_bDextraDongle = true; } diff --git a/reflector/G3Client.h b/reflector/G3Client.h index a4cf2d3..d5c313d 100644 --- a/reflector/G3Client.h +++ b/reflector/G3Client.h @@ -34,7 +34,6 @@ public: // identity EProtocol GetProtocol(void) const { return EProtocol::g3; } const char *GetProtocolName(void) const { return "Terminal/AP"; } - ECodecType GetCodec(void) const { return ECodecType::dstar; } bool IsNode(void) const { return true; } // status diff --git a/reflector/M17Client.h b/reflector/M17Client.h index 688fb38..407090e 100644 --- a/reflector/M17Client.h +++ b/reflector/M17Client.h @@ -39,6 +39,7 @@ public: // identity const char *GetProtocolName(void) const { return "M17"; } bool IsNode(void) const { return true; } + EProtocol GetProtocol(void) const { return EProtocol::m17; } // status bool IsAlive(void) const; diff --git a/reflector/PacketStream.cpp b/reflector/PacketStream.cpp index f8d8d5a..cda2c8b 100644 --- a/reflector/PacketStream.cpp +++ b/reflector/PacketStream.cpp @@ -53,7 +53,7 @@ bool CPacketStream::OpenPacketStream(const CDvHeaderPacket &DvHeader, std::share m_LastPacketTime.start(); #ifdef TRANSCODED_MODULES if (std::string::npos != std::string(TRANSCODED_MODULES).find(DvHeader.GetRpt2Module())) - m_CodecStream = std::make_shared(this, m_uiStreamId, client->GetCodec(), m_TCReader); + m_CodecStream = std::make_shared(this, m_uiStreamId, DvHeader.GetCodecIn(), m_TCReader); #endif ok = true; } diff --git a/reflector/URFClient.h b/reflector/URFClient.h index 99471d3..d0a2a9b 100644 --- a/reflector/URFClient.h +++ b/reflector/URFClient.h @@ -35,7 +35,6 @@ public: EProtocol GetProtocol(void) const { return EProtocol::urf; } EProtoRev GetProtocolRevision(void) const { return m_ProtRev; } const char *GetProtocolName(void) const { return "URF"; } - ECodecType GetCodec(void) const { return ECodecType::none; } bool IsPeer(void) const { return true; } // status diff --git a/reflector/YSFClient.h b/reflector/YSFClient.h index e8c0e9d..08ff034 100644 --- a/reflector/YSFClient.h +++ b/reflector/YSFClient.h @@ -33,7 +33,6 @@ public: // identity EProtocol GetProtocol(void) const { return EProtocol::ysf; } const char *GetProtocolName(void) const { return "YSF"; } - ECodecType GetCodec(void) const { return ECodecType::dmr; } bool IsNode(void) const { return true; } // status