MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-24 01:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change all of the enums to the modern format.

Browse Source
This commit is contained in:
Jonathan Naylor
2025-03-13 18:16:33 +00:00
parent 78fc96b0a5
commit 43f8b2f6f0
50 changed files with 1085 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
NXDNKenwoodNetwork.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2014,2016,2018,2020 by Jonathan Naylor G4KLX
* Copyright (C) 2009-2014,2016,2018,2020,2025 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
@@ -110,15 +110,15 @@ bool CNXDNKenwoodNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_
assert(data != NULL);
switch (type) {
case NNMT_VOICE_HEADER: // Voice header or trailer
case NNMT_VOICE_TRAILER:
case NXDN_NETWORK_MESSAGE_TYPE::VOICE_HEADER: // Voice header or trailer
case NXDN_NETWORK_MESSAGE_TYPE::VOICE_TRAILER:
return processIcomVoiceHeader(data);
case NNMT_VOICE_BODY: // Voice data
case NXDN_NETWORK_MESSAGE_TYPE::VOICE_BODY: // Voice data
return processIcomVoiceData(data);
case NNMT_DATA_HEADER: // Data header or trailer
case NNMT_DATA_TRAILER:
case NXDN_NETWORK_MESSAGE_TYPE::DATA_HEADER: // Data header or trailer
case NXDN_NETWORK_MESSAGE_TYPE::DATA_TRAILER:
return processIcomDataHeader(data);
case NNMT_DATA_BODY: // Data data
case NXDN_NETWORK_MESSAGE_TYPE::DATA_BODY: // Data data
return processIcomDataData(data);
default:
return false;
@@ -774,7 +774,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data)
if (length <= 0)
return 0U;
if (!CUDPSocket::match(m_rtpAddr, address, IMT_ADDRESS_ONLY)) {
if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::IMT_ADDREONLY)) {
LogMessage("NXDN, RTP packet received from an invalid source");
return 0U;
}
@@ -802,7 +802,7 @@ unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data)
if (length <= 0)
return 0U;
if (!CUDPSocket::match(m_rtpAddr, address, IMT_ADDRESS_ONLY)) {
if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::IMT_ADDREONLY)) {
LogMessage("NXDN, RTCP packet received from an invalid source");
return 0U;
}