Set DMR & YSF suffixes in DV Header

6 years ago · 131beeb544
parent 7d1a1cc3bf
commit 131beeb544
3 changed files with 2 additions and 2 deletions
--- a/src/cdmriddirfile.cpp
+++ b/src/cdmriddirfile.cpp
@ -128,7 +128,6 @@ bool CDmridDirFile::RefreshContent(const CBuffer &buffer)
                    // new entry
                    uint32 ui = atoi(dmrid);
                    CCallsign cs(callsign, ui);
-                    cs.SetSuffix("DMR");
                    if ( cs.IsValid() )
                    {
                        m_CallsignMap.insert(std::pair<uint32,CCallsign>(ui, cs));
--- a/src/cdmriddirhttp.cpp
+++ b/src/cdmriddirhttp.cpp
@ -70,7 +70,6 @@ bool CDmridDirHttp::RefreshContent(const CBuffer &buffer)
                    // new entry
                    uint32 ui = atoi(dmrid);
                    CCallsign cs(callsign, ui);
-                    cs.SetSuffix("DMR");
                    if ( cs.IsValid() )
                    {
                        m_CallsignMap.insert(std::pair<uint32,CCallsign>(ui, cs));
--- a/src/cdvheaderpacket.cpp
+++ b/src/cdvheaderpacket.cpp
@ -68,6 +68,7 @@ CDvHeaderPacket::CDvHeaderPacket(uint32 my, const CCallsign &ur, const CCallsign
    m_csRPT1 = rpt1;
    m_csRPT2 = rpt2;
    m_csMY = CCallsign("", my);
+    m_csMY.SetSuffix("DMR");
 }

 // YSF constructor
@ -83,6 +84,7 @@ CDvHeaderPacket::CDvHeaderPacket(const CCallsign &my, const CCallsign &ur, const
    m_csRPT1 = rpt1;
    m_csRPT2 = rpt2;
    m_csMY = my;
+    m_csMY.SetSuffix("YSF");
 }