g4klx/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway.git synced 2026-04-07 07:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into XLXs

Browse source
This commit is contained in:
Jonathan Naylor 2017-09-16 14:50:30 +01:00
commit 5faeeed423
5 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Conf.cpp
View file

@ -62,6 +62,7 @@ m_dmrNetwork1Local(0U),
m_dmrNetwork1Password(),
m_dmrNetwork1Options(),
m_dmrNetwork1Debug(false),
m_dmrNetwork1Location(true),
m_dmrNetwork1TGRewrites(),
m_dmrNetwork1PCRewrites(),
m_dmrNetwork1TypeRewrites(),
@ -76,6 +77,7 @@ m_dmrNetwork2Port(0U),
m_dmrNetwork2Local(0U),
m_dmrNetwork2Password(),
m_dmrNetwork2Options(),
m_dmrNetwork2Location(true),
m_dmrNetwork2Debug(false),
m_dmrNetwork2TGRewrites(),
m_dmrNetwork2PCRewrites(),
@ -213,6 +215,8 @@ bool CConf::read()
m_dmrNetwork1Password = value;
else if (::strcmp(key, "Options") == 0)
m_dmrNetwork1Options = value;
else if (::strcmp(key, "Location") == 0)
m_dmrNetwork1Location = ::atoi(value) == 1;
else if (::strcmp(key, "Debug") == 0)
m_dmrNetwork1Debug = ::atoi(value) == 1;
else if (::strcmp(key, "TGRewrite") == 0) {
@ -297,6 +301,8 @@ bool CConf::read()
m_dmrNetwork2Password = value;
else if (::strcmp(key, "Options") == 0)
m_dmrNetwork2Options = value;
else if (::strcmp(key, "Location") == 0)
m_dmrNetwork2Location = ::atoi(value) == 1;
else if (::strcmp(key, "Debug") == 0)
m_dmrNetwork2Debug = ::atoi(value) == 1;
else if (::strcmp(key, "TGRewrite") == 0) {
@ -540,6 +546,11 @@ std::string CConf::getDMRNetwork1Options() const
return m_dmrNetwork1Options;
}
bool CConf::getDMRNetwork1Location() const
{
return m_dmrNetwork1Location;
}
bool CConf::getDMRNetwork1Debug() const
{
return m_dmrNetwork1Debug;
@ -618,6 +629,11 @@ std::string CConf::getDMRNetwork2Options() const
return m_dmrNetwork2Options;
}
bool CConf::getDMRNetwork2Location() const
{
return m_dmrNetwork2Location;
}
bool CConf::getDMRNetwork2Debug() const
{
return m_dmrNetwork2Debug;