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

Merge branch 'master' into IAX

Browse Source
This commit is contained in:
Jonathan Naylor
2024-07-15 13:56:48 +01:00
parent cbe8fd4342 cf96a2653f
commit 43fad4b30d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FMRAWNetwork.cpp
View File

@@ -79,6 +79,13 @@ bool CFMRAWNetwork::open()
LogMessage("Opening FM RAW network connection"); LogMessage("Opening FM RAW network connection");
#if !defined(HAS_SRC)
if (m_sampleRate != MMDVM_SAMPLERATE) {
LogError("The resampler needed for non-native sample rates has not been included");
return false;
}
#endif
if (!m_squelchFile.empty()) { if (!m_squelchFile.empty()) {
m_fp = ::fopen(m_squelchFile.c_str(), "wb"); m_fp = ::fopen(m_squelchFile.c_str(), "wb");
if (m_fp == NULL) { if (m_fp == NULL) {

8
RemoteControl.cpp
View File

@@ -192,7 +192,7 @@ REMOTE_COMMAND CRemoteControl::getCommand()
#endif #endif
} }
m_socket.write((unsigned char*)replyStr.c_str(), replyStr.length(), address, addrlen); m_socket.write((unsigned char*)replyStr.c_str(), (unsigned int)replyStr.length(), address, addrlen);
} }
return m_command; return m_command;
@@ -209,14 +209,14 @@ unsigned int CRemoteControl::getArgCount() const
case RCD_MODE_P25: case RCD_MODE_P25:
case RCD_MODE_NXDN: case RCD_MODE_NXDN:
case RCD_MODE_M17: case RCD_MODE_M17:
return m_args.size() - SET_MODE_ARGS; return (unsigned int)m_args.size() - SET_MODE_ARGS;
case RCD_PAGE: case RCD_PAGE:
case RCD_PAGE_BCD: case RCD_PAGE_BCD:
case RCD_PAGE_A1: case RCD_PAGE_A1:
case RCD_PAGE_A2: case RCD_PAGE_A2:
return m_args.size() - 1U; return (unsigned int)m_args.size() - 1U;
case RCD_CW: case RCD_CW:
return m_args.size() - 1U; return (unsigned int)m_args.size() - 1U;
default: default:
return 0U; return 0U;
} }