mirror of
https://github.com/g4klx/MMDVMHost.git
synced 2026-04-06 06:53:42 +00:00
Merge branch 'master' into mqtt
This commit is contained in:
commit
c3d8a4ce9d
14 changed files with 401 additions and 180 deletions
18
Conf.cpp
18
Conf.cpp
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2015-2022 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2015-2023 by Jonathan Naylor G4KLX
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -296,6 +296,8 @@ m_pocsagNetworkModeHang(3U),
|
|||
m_pocsagNetworkDebug(false),
|
||||
m_fmNetworkEnabled(false),
|
||||
m_fmNetworkProtocol("USRP"),
|
||||
m_fmNetworkSampleRate(48000U),
|
||||
m_fmNetworkSquelchFile(),
|
||||
m_fmGatewayAddress(),
|
||||
m_fmGatewayPort(0U),
|
||||
m_fmLocalAddress(),
|
||||
|
|
@ -1052,6 +1054,10 @@ bool CConf::read()
|
|||
m_fmNetworkEnabled = ::atoi(value) == 1;
|
||||
else if (::strcmp(key, "Protocol") == 0)
|
||||
m_fmNetworkProtocol = value;
|
||||
else if (::strcmp(key, "SampleRate") == 0)
|
||||
m_fmNetworkSampleRate = (unsigned int)::atoi(value);
|
||||
else if (::strcmp(key, "SquelchFile") == 0)
|
||||
m_fmNetworkSquelchFile = value;
|
||||
else if (::strcmp(key, "LocalAddress") == 0)
|
||||
m_fmLocalAddress = value;
|
||||
else if (::strcmp(key, "LocalPort") == 0)
|
||||
|
|
@ -2317,6 +2323,16 @@ std::string CConf::getFMNetworkProtocol() const
|
|||
return m_fmNetworkProtocol;
|
||||
}
|
||||
|
||||
unsigned int CConf::getFMNetworkSampleRate() const
|
||||
{
|
||||
return m_fmNetworkSampleRate;
|
||||
}
|
||||
|
||||
std::string CConf::getFMNetworkSquelchFile() const
|
||||
{
|
||||
return m_fmNetworkSquelchFile;
|
||||
}
|
||||
|
||||
std::string CConf::getFMGatewayAddress() const
|
||||
{
|
||||
return m_fmGatewayAddress;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue