Merge branch 'master' into DualInputs

This commit is contained in:
Jonathan Naylor
2021-04-25 09:57:39 +01:00
16 changed files with 162 additions and 161 deletions

View File

@@ -30,7 +30,7 @@ const unsigned int BUFFER_LENGTH = 500U;
const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U;
CMMDVMNetworkNew::CMMDVMNetworkNew(const char* name, const std::string& rptAddress, unsigned int rptPort, const std::string& localAddress, unsigned int localPort, bool debug) :
CMMDVMNetworkNew::CMMDVMNetworkNew(const char* name, const std::string& rptAddress, unsigned short rptPort, const std::string& localAddress, unsigned short localPort, bool debug) :
m_name(name),
m_rptAddr(),
m_rptAddrLen(0U),