MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 06:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the old System Fusion SQL config option and processing.

Browse Source
This commit is contained in:
Jonathan Naylor
2019-02-12 11:29:05 +00:00
parent c3c5fe1a5a
commit 72fe13780f
7 changed files with 84 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Conf.cpp
View File

@@ -151,8 +151,8 @@ m_fusionLowDeviation(false),
m_fusionRemoteGateway(false),
m_fusionSelfOnly(false),
m_fusionTXHang(4U),
m_fusionSQLEnabled(false),
m_fusionSQL(0U),
m_fusionDGIdEnabled(false),
m_fusionDGId(0U),
m_fusionModeHang(10U),
m_p25Enabled(false),
m_p25Id(0U),
@@ -595,9 +595,9 @@ bool CConf::read()
m_fusionEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "LowDeviation") == 0)
m_fusionLowDeviation = ::atoi(value) == 1;
else if (::strcmp(key, "DSQ") == 0 || ::strcmp(key, "DGID") == 0) {
m_fusionSQLEnabled = true;
m_fusionSQL = (unsigned int)::atoi(value);
else if (::strcmp(key, "DGID") == 0) {
m_fusionDGIdEnabled = true;
m_fusionDGId = (unsigned int)::atoi(value);
} else if (::strcmp(key, "RemoteGateway") == 0)
m_fusionRemoteGateway = ::atoi(value) == 1;
else if (::strcmp(key, "SelfOnly") == 0)
@@ -1276,14 +1276,14 @@ bool CConf::getFusionSelfOnly() const
return m_fusionSelfOnly;
}
bool CConf::getFusionSQLEnabled() const
bool CConf::getFusionDGIdEnabled() const
{
return m_fusionSQLEnabled;
return m_fusionDGIdEnabled;
}
unsigned char CConf::getFusionSQL() const
unsigned char CConf::getFusionDGId() const
{
return m_fusionSQL;
return m_fusionDGId;
}
unsigned int CConf::getFusionModeHang() const