diff --git a/FMRAWNetwork.cpp b/FMRAWNetwork.cpp index 4aeeb82..f8162b9 100644 --- a/FMRAWNetwork.cpp +++ b/FMRAWNetwork.cpp @@ -79,6 +79,13 @@ bool CFMRAWNetwork::open() 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()) { m_fp = ::fopen(m_squelchFile.c_str(), "wb"); if (m_fp == NULL) { diff --git a/RemoteControl.cpp b/RemoteControl.cpp index f88f15d..3951693 100644 --- a/RemoteControl.cpp +++ b/RemoteControl.cpp @@ -192,7 +192,7 @@ REMOTE_COMMAND CRemoteControl::getCommand() #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; @@ -209,14 +209,14 @@ unsigned int CRemoteControl::getArgCount() const case RCD_MODE_P25: case RCD_MODE_NXDN: 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_BCD: case RCD_PAGE_A1: case RCD_PAGE_A2: - return m_args.size() - 1U; + return (unsigned int)m_args.size() - 1U; case RCD_CW: - return m_args.size() - 1U; + return (unsigned int)m_args.size() - 1U; default: return 0U; }