removed C*Client::GetCodec

unstable
Tom Early 4 years ago
parent 54425efae8
commit 776752527b

@ -35,7 +35,6 @@ public:
EProtocol GetProtocol(void) const { return EProtocol::xlx; } EProtocol GetProtocol(void) const { return EProtocol::xlx; }
EProtoRev GetProtocolRevision(void) const { return EProtoRev::ambe; } EProtoRev GetProtocolRevision(void) const { return EProtoRev::ambe; }
const char *GetProtocolName(void) const { return "XLX"; } const char *GetProtocolName(void) const { return "XLX"; }
ECodecType GetCodec(void) const { return ECodecType::dmr; }
bool IsPeer(void) const { return true; } bool IsPeer(void) const { return true; }
// status // status

@ -55,7 +55,6 @@ public:
// identity // identity
virtual EProtocol GetProtocol(void) const { return EProtocol::none; } virtual EProtocol GetProtocol(void) const { return EProtocol::none; }
virtual EProtoRev GetProtocolRevision(void) const { return EProtoRev::ambe; } 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 const char *GetProtocolName(void) const { return "none"; }
virtual bool IsNode(void) const { return false; } virtual bool IsNode(void) const { return false; }
virtual bool IsPeer(void) const { return false; } virtual bool IsPeer(void) const { return false; }

@ -34,7 +34,6 @@ public:
// identity // identity
EProtocol GetProtocol(void) const { return EProtocol::dcs; } EProtocol GetProtocol(void) const { return EProtocol::dcs; }
const char *GetProtocolName(void) const { return "DCS"; } const char *GetProtocolName(void) const { return "DCS"; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; } bool IsNode(void) const { return true; }
// status // status

@ -42,7 +42,6 @@ public:
EProtocol GetProtocol(void) const { return EProtocol::dextra; } EProtocol GetProtocol(void) const { return EProtocol::dextra; }
EProtoRev GetProtocolRevision(void) const { return m_ProtRev; } EProtoRev GetProtocolRevision(void) const { return m_ProtRev; }
const char *GetProtocolName(void) const { return "DExtra"; } const char *GetProtocolName(void) const { return "DExtra"; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; } bool IsNode(void) const { return true; }
// status // status

@ -34,7 +34,6 @@ public:
// identity // identity
EProtocol GetProtocol(void) const { return EProtocol::dmrmmdvm; } EProtocol GetProtocol(void) const { return EProtocol::dmrmmdvm; }
const char *GetProtocolName(void) const { return "DMRMmdvm"; } const char *GetProtocolName(void) const { return "DMRMmdvm"; }
ECodecType GetCodec(void) const { return ECodecType::dmr; }
bool IsNode(void) const { return true; } bool IsNode(void) const { return true; }
// status // status

@ -34,7 +34,6 @@ public:
// identity // identity
EProtocol GetProtocol(void) const { return EProtocol::dmrplus; } EProtocol GetProtocol(void) const { return EProtocol::dmrplus; }
const char *GetProtocolName(void) const { return "DMRplus"; } const char *GetProtocolName(void) const { return "DMRplus"; }
ECodecType GetCodec(void) const { return ECodecType::dmr; }
bool IsNode(void) const { return true; } bool IsNode(void) const { return true; }
// status // status

@ -34,7 +34,6 @@ public:
// identity // identity
EProtocol GetProtocol(void) const { return EProtocol::dplus; } EProtocol GetProtocol(void) const { return EProtocol::dplus; }
const char *GetProtocolName(void) const { return "DPlus"; } const char *GetProtocolName(void) const { return "DPlus"; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; } bool IsNode(void) const { return true; }
bool IsDextraDongle(void) const { return m_bDextraDongle; } bool IsDextraDongle(void) const { return m_bDextraDongle; }
void SetDextraDongle(void) { m_bDextraDongle = true; } void SetDextraDongle(void) { m_bDextraDongle = true; }

@ -34,7 +34,6 @@ public:
// identity // identity
EProtocol GetProtocol(void) const { return EProtocol::g3; } EProtocol GetProtocol(void) const { return EProtocol::g3; }
const char *GetProtocolName(void) const { return "Terminal/AP"; } const char *GetProtocolName(void) const { return "Terminal/AP"; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; } bool IsNode(void) const { return true; }
// status // status

@ -39,6 +39,7 @@ public:
// identity // identity
const char *GetProtocolName(void) const { return "M17"; } const char *GetProtocolName(void) const { return "M17"; }
bool IsNode(void) const { return true; } bool IsNode(void) const { return true; }
EProtocol GetProtocol(void) const { return EProtocol::m17; }
// status // status
bool IsAlive(void) const; bool IsAlive(void) const;

@ -53,7 +53,7 @@ bool CPacketStream::OpenPacketStream(const CDvHeaderPacket &DvHeader, std::share
m_LastPacketTime.start(); m_LastPacketTime.start();
#ifdef TRANSCODED_MODULES #ifdef TRANSCODED_MODULES
if (std::string::npos != std::string(TRANSCODED_MODULES).find(DvHeader.GetRpt2Module())) if (std::string::npos != std::string(TRANSCODED_MODULES).find(DvHeader.GetRpt2Module()))
m_CodecStream = std::make_shared<CCodecStream>(this, m_uiStreamId, client->GetCodec(), m_TCReader); m_CodecStream = std::make_shared<CCodecStream>(this, m_uiStreamId, DvHeader.GetCodecIn(), m_TCReader);
#endif #endif
ok = true; ok = true;
} }

@ -35,7 +35,6 @@ public:
EProtocol GetProtocol(void) const { return EProtocol::urf; } EProtocol GetProtocol(void) const { return EProtocol::urf; }
EProtoRev GetProtocolRevision(void) const { return m_ProtRev; } EProtoRev GetProtocolRevision(void) const { return m_ProtRev; }
const char *GetProtocolName(void) const { return "URF"; } const char *GetProtocolName(void) const { return "URF"; }
ECodecType GetCodec(void) const { return ECodecType::none; }
bool IsPeer(void) const { return true; } bool IsPeer(void) const { return true; }
// status // status

@ -33,7 +33,6 @@ public:
// identity // identity
EProtocol GetProtocol(void) const { return EProtocol::ysf; } EProtocol GetProtocol(void) const { return EProtocol::ysf; }
const char *GetProtocolName(void) const { return "YSF"; } const char *GetProtocolName(void) const { return "YSF"; }
ECodecType GetCodec(void) const { return ECodecType::dmr; }
bool IsNode(void) const { return true; } bool IsNode(void) const { return true; }
// status // status

Loading…
Cancel
Save

Powered by TurnKey Linux.