MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-24 01:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up TG rewrite code.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-09-17 16:29:43 +01:00
parent cb8cc99efd
commit 730d14fde2
7 changed files with 129 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Conf.cpp
View File

@@ -93,8 +93,8 @@ m_dmrBeacons(false),
m_dmrId(0U),
m_dmrColorCode(2U),
m_dmrSelfOnly(false),
m_TGRewriteSlot1(false),
m_TGRewriteSlot2(false),
m_dmrTGRewriteSlot1(false),
m_dmrTGRewriteSlot2(false),
m_dmrPrefixes(),
m_dmrBlackList(),
m_dmrDstIdBlacklistSlot1RF(),
@@ -333,9 +333,9 @@ bool CConf::read()
else if (::strcmp(key, "SelfOnly") == 0)
m_dmrSelfOnly = ::atoi(value) == 1;
else if (::strcmp(key, "TGRewriteSlot1") == 0)
m_TGRewriteSlot1 = ::atoi(value) == 1;
m_dmrTGRewriteSlot1 = ::atoi(value) == 1;
else if (::strcmp(key, "TGRewriteSlot2") == 0)
m_TGRewriteSlot2 = ::atoi(value) == 1;
m_dmrTGRewriteSlot2 = ::atoi(value) == 1;
else if (::strcmp(key, "Prefixes") == 0) {
char* p = ::strtok(value, ",\r\n");
while (p != NULL) {
@@ -756,12 +756,12 @@ bool CConf::getDMRSelfOnly() const
bool CConf::getDMRTGRewriteSlot1() const
{
return m_TGRewriteSlot1;
return m_dmrTGRewriteSlot1;
}
bool CConf::getDMRTGRewriteSlot2() const
{
return m_TGRewriteSlot2;
return m_dmrTGRewriteSlot2;
}
std::vector<unsigned int> CConf::getDMRPrefixes() const