Merge branch 'master' into mqtt

This commit is contained in:
Jonathan Naylor
2023-10-25 17:03:53 +01:00
14 changed files with 401 additions and 180 deletions

6
Conf.h
View File

@@ -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
@@ -310,6 +310,8 @@ public:
// The FM Network section
bool getFMNetworkEnabled() const;
std::string getFMNetworkProtocol() const;
unsigned int getFMNetworkSampleRate() const;
std::string getFMNetworkSquelchFile() const;
std::string getFMGatewayAddress() const;
unsigned short getFMGatewayPort() const;
std::string getFMLocalAddress() const;
@@ -633,6 +635,8 @@ private:
bool m_fmNetworkEnabled;
std::string m_fmNetworkProtocol;
unsigned int m_fmNetworkSampleRate;
std::string m_fmNetworkSquelchFile;
std::string m_fmGatewayAddress;
unsigned short m_fmGatewayPort;
std::string m_fmLocalAddress;