Remove the FM networking sample rate conversion.
This commit is contained in:
parent
a5ee4284f2
commit
cfe9e0fba4
10
Conf.cpp
10
Conf.cpp
|
@ -283,12 +283,11 @@ m_pocsagLocalPort(0U),
|
||||||
m_pocsagNetworkModeHang(3U),
|
m_pocsagNetworkModeHang(3U),
|
||||||
m_pocsagNetworkDebug(false),
|
m_pocsagNetworkDebug(false),
|
||||||
m_fmNetworkEnabled(false),
|
m_fmNetworkEnabled(false),
|
||||||
m_fmNetworkProtocol("MMDVM"),
|
m_fmNetworkProtocol("USRP"),
|
||||||
m_fmGatewayAddress(),
|
m_fmGatewayAddress(),
|
||||||
m_fmGatewayPort(0U),
|
m_fmGatewayPort(0U),
|
||||||
m_fmLocalAddress(),
|
m_fmLocalAddress(),
|
||||||
m_fmLocalPort(0U),
|
m_fmLocalPort(0U),
|
||||||
m_fmSampleRate(8000U),
|
|
||||||
m_fmPreEmphasis(true),
|
m_fmPreEmphasis(true),
|
||||||
m_fmDeEmphasis(true),
|
m_fmDeEmphasis(true),
|
||||||
m_fmTXAudioGain(1.0F),
|
m_fmTXAudioGain(1.0F),
|
||||||
|
@ -1013,8 +1012,6 @@ bool CConf::read()
|
||||||
m_fmGatewayAddress = value;
|
m_fmGatewayAddress = value;
|
||||||
else if (::strcmp(key, "GatewayPort") == 0)
|
else if (::strcmp(key, "GatewayPort") == 0)
|
||||||
m_fmGatewayPort = (unsigned int)::atoi(value);
|
m_fmGatewayPort = (unsigned int)::atoi(value);
|
||||||
else if (::strcmp(key, "SampleRate") == 0)
|
|
||||||
m_fmSampleRate = (unsigned int)::atoi(value);
|
|
||||||
else if (::strcmp(key, "PreEmphasis") == 0)
|
else if (::strcmp(key, "PreEmphasis") == 0)
|
||||||
m_fmPreEmphasis = ::atoi(value) == 1;
|
m_fmPreEmphasis = ::atoi(value) == 1;
|
||||||
else if (::strcmp(key, "DeEmphasis") == 0)
|
else if (::strcmp(key, "DeEmphasis") == 0)
|
||||||
|
@ -2237,11 +2234,6 @@ unsigned int CConf::getFMLocalPort() const
|
||||||
return m_fmLocalPort;
|
return m_fmLocalPort;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int CConf::getFMSampleRate() const
|
|
||||||
{
|
|
||||||
return m_fmSampleRate;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CConf::getFMPreEmphasis() const
|
bool CConf::getFMPreEmphasis() const
|
||||||
{
|
{
|
||||||
return m_fmPreEmphasis;
|
return m_fmPreEmphasis;
|
||||||
|
|
2
Conf.h
2
Conf.h
|
@ -301,7 +301,6 @@ public:
|
||||||
unsigned int getFMGatewayPort() const;
|
unsigned int getFMGatewayPort() const;
|
||||||
std::string getFMLocalAddress() const;
|
std::string getFMLocalAddress() const;
|
||||||
unsigned int getFMLocalPort() const;
|
unsigned int getFMLocalPort() const;
|
||||||
unsigned int getFMSampleRate() const;
|
|
||||||
bool getFMPreEmphasis() const;
|
bool getFMPreEmphasis() const;
|
||||||
bool getFMDeEmphasis() const;
|
bool getFMDeEmphasis() const;
|
||||||
float getFMTXAudioGain() const;
|
float getFMTXAudioGain() const;
|
||||||
|
@ -613,7 +612,6 @@ private:
|
||||||
unsigned int m_fmGatewayPort;
|
unsigned int m_fmGatewayPort;
|
||||||
std::string m_fmLocalAddress;
|
std::string m_fmLocalAddress;
|
||||||
unsigned int m_fmLocalPort;
|
unsigned int m_fmLocalPort;
|
||||||
unsigned int m_fmSampleRate;
|
|
||||||
bool m_fmPreEmphasis;
|
bool m_fmPreEmphasis;
|
||||||
bool m_fmDeEmphasis;
|
bool m_fmDeEmphasis;
|
||||||
float m_fmTXAudioGain;
|
float m_fmTXAudioGain;
|
||||||
|
|
153
FMNetwork.cpp
153
FMNetwork.cpp
|
@ -27,44 +27,28 @@
|
||||||
|
|
||||||
const unsigned int BUFFER_LENGTH = 1500U;
|
const unsigned int BUFFER_LENGTH = 1500U;
|
||||||
|
|
||||||
CFMNetwork::CFMNetwork(const std::string& protocol, const std::string& localAddress, unsigned int localPort, const std::string& gatewayAddress, unsigned int gatewayPort, unsigned int sampleRate, bool debug) :
|
CFMNetwork::CFMNetwork(const std::string& protocol, const std::string& localAddress, unsigned int localPort, const std::string& gatewayAddress, unsigned int gatewayPort, bool debug) :
|
||||||
m_protocol(FMNP_MMDVM),
|
m_protocol(FMNP_USRP),
|
||||||
m_socket(localAddress, localPort),
|
m_socket(localAddress, localPort),
|
||||||
m_addr(),
|
m_addr(),
|
||||||
m_addrLen(0U),
|
m_addrLen(0U),
|
||||||
m_sampleRate(sampleRate),
|
|
||||||
m_debug(debug),
|
m_debug(debug),
|
||||||
m_enabled(false),
|
m_enabled(false),
|
||||||
m_buffer(2000U, "FM Network"),
|
m_buffer(2000U, "FM Network"),
|
||||||
m_pollTimer(1000U, 5U),
|
|
||||||
m_seqNo(0U)
|
m_seqNo(0U)
|
||||||
{
|
{
|
||||||
assert(gatewayPort > 0U);
|
assert(gatewayPort > 0U);
|
||||||
assert(!gatewayAddress.empty());
|
assert(!gatewayAddress.empty());
|
||||||
assert(sampleRate > 0U);
|
|
||||||
|
|
||||||
if (CUDPSocket::lookup(gatewayAddress, gatewayPort, m_addr, m_addrLen) != 0)
|
if (CUDPSocket::lookup(gatewayAddress, gatewayPort, m_addr, m_addrLen) != 0)
|
||||||
m_addrLen = 0U;
|
m_addrLen = 0U;
|
||||||
|
|
||||||
if (protocol == "USRP")
|
// if (protocol == "USRP")
|
||||||
m_protocol = FMNP_USRP;
|
// m_protocol = FMNP_USRP;
|
||||||
|
|
||||||
#if !defined(_WIN32) && !defined(_WIN64)
|
|
||||||
int error;
|
|
||||||
m_incoming = ::src_new(SRC_SINC_FASTEST, 1, &error);
|
|
||||||
m_outgoing = ::src_new(SRC_SINC_FASTEST, 1, &error);
|
|
||||||
|
|
||||||
assert(m_incoming != NULL);
|
|
||||||
assert(m_outgoing != NULL);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CFMNetwork::~CFMNetwork()
|
CFMNetwork::~CFMNetwork()
|
||||||
{
|
{
|
||||||
#if !defined(_WIN32) && !defined(_WIN64)
|
|
||||||
::src_delete(m_incoming);
|
|
||||||
::src_delete(m_outgoing);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CFMNetwork::open()
|
bool CFMNetwork::open()
|
||||||
|
@ -76,8 +60,6 @@ bool CFMNetwork::open()
|
||||||
|
|
||||||
LogMessage("Opening FM network connection");
|
LogMessage("Opening FM network connection");
|
||||||
|
|
||||||
m_pollTimer.start();
|
|
||||||
|
|
||||||
return m_socket.open(m_addr);
|
return m_socket.open(m_addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,31 +68,6 @@ bool CFMNetwork::writeData(float* data, unsigned int nSamples)
|
||||||
assert(data != NULL);
|
assert(data != NULL);
|
||||||
assert(nSamples > 0U);
|
assert(nSamples > 0U);
|
||||||
|
|
||||||
#if !defined(_WIN32) && !defined(_WIN64)
|
|
||||||
assert(m_outgoing != NULL);
|
|
||||||
|
|
||||||
float out[1000U];
|
|
||||||
SRC_DATA src;
|
|
||||||
|
|
||||||
if (m_sampleRate != 8000U) {
|
|
||||||
src.data_in = data;
|
|
||||||
src.data_out = out;
|
|
||||||
src.input_frames = nSamples;
|
|
||||||
src.output_frames = 1000;
|
|
||||||
src.end_of_input = 0;
|
|
||||||
src.src_ratio = double(m_sampleRate) / 8000.0;
|
|
||||||
|
|
||||||
int ret = ::src_process(m_outgoing, &src);
|
|
||||||
if (ret != 0) {
|
|
||||||
LogError("Error up/downsampling of the output audio has an error - %s", src_strerror(ret));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
src.data_out = data;
|
|
||||||
src.output_frames_gen = nSamples;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
unsigned char buffer[1500U];
|
unsigned char buffer[1500U];
|
||||||
::memset(buffer, 0x00U, 1500U);
|
::memset(buffer, 0x00U, 1500U);
|
||||||
|
|
||||||
|
@ -159,19 +116,10 @@ bool CFMNetwork::writeData(float* data, unsigned int nSamples)
|
||||||
buffer[length++] = 0x00U;
|
buffer[length++] = 0x00U;
|
||||||
buffer[length++] = 0x00U;
|
buffer[length++] = 0x00U;
|
||||||
buffer[length++] = 0x00U;
|
buffer[length++] = 0x00U;
|
||||||
} else {
|
|
||||||
buffer[length++] = 'F';
|
|
||||||
buffer[length++] = 'M';
|
|
||||||
buffer[length++] = 'D';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(_WIN64)
|
|
||||||
for (unsigned int i = 0U; i < nSamples; i++) {
|
for (unsigned int i = 0U; i < nSamples; i++) {
|
||||||
short val = short(data[i] * 32767.0F + 0.5F); // Changing audio format from float to S16LE
|
short val = short(data[i] * 32767.0F + 0.5F); // Changing audio format from float to S16LE
|
||||||
#else
|
|
||||||
for (long i = 0L; i < src.output_frames_gen; i++) {
|
|
||||||
short val = short(src.data_out[i] * 32767.0F + 0.5F); // Changing audio format from float to S16LE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
buffer[length++] = (val >> 0) & 0xFFU;
|
buffer[length++] = (val >> 0) & 0xFFU;
|
||||||
buffer[length++] = (val >> 8) & 0xFFU;
|
buffer[length++] = (val >> 8) & 0xFFU;
|
||||||
|
@ -187,31 +135,11 @@ bool CFMNetwork::writeData(float* data, unsigned int nSamples)
|
||||||
|
|
||||||
bool CFMNetwork::writeEOT()
|
bool CFMNetwork::writeEOT()
|
||||||
{
|
{
|
||||||
if (m_protocol == FMNP_MMDVM) {
|
|
||||||
unsigned char buffer[10U];
|
|
||||||
::memset(buffer, 0x00U, 10U);
|
|
||||||
|
|
||||||
buffer[0U] = 'F';
|
|
||||||
buffer[1U] = 'M';
|
|
||||||
buffer[2U] = 'E';
|
|
||||||
|
|
||||||
if (m_debug)
|
|
||||||
CUtils::dump(1U, "FM Network End of Transmission Sent", buffer, 3U);
|
|
||||||
|
|
||||||
return m_socket.write(buffer, 3U, m_addr, m_addrLen);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CFMNetwork::clock(unsigned int ms)
|
void CFMNetwork::clock(unsigned int ms)
|
||||||
{
|
{
|
||||||
m_pollTimer.clock(ms);
|
|
||||||
if (m_pollTimer.hasExpired()) {
|
|
||||||
writePoll();
|
|
||||||
m_pollTimer.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned char buffer[BUFFER_LENGTH];
|
unsigned char buffer[BUFFER_LENGTH];
|
||||||
|
|
||||||
sockaddr_storage addr;
|
sockaddr_storage addr;
|
||||||
|
@ -248,19 +176,6 @@ void CFMNetwork::clock(unsigned int ms)
|
||||||
|
|
||||||
if (type == 0U)
|
if (type == 0U)
|
||||||
m_buffer.addData(buffer + 32U, length - 32U);
|
m_buffer.addData(buffer + 32U, length - 32U);
|
||||||
} else {
|
|
||||||
// Ignore incoming polls
|
|
||||||
if (::memcmp(buffer, "FMP", 3U) == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Invalid packet type?
|
|
||||||
if (::memcmp(buffer, "FMD", 3U) != 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (length < 3)
|
|
||||||
return;
|
|
||||||
|
|
||||||
m_buffer.addData(buffer + 3U, length - 3U);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -279,58 +194,16 @@ unsigned int CFMNetwork::read(float* data, unsigned int nSamples)
|
||||||
unsigned char buffer[1500U];
|
unsigned char buffer[1500U];
|
||||||
m_buffer.getData(buffer, nSamples * sizeof(unsigned short));
|
m_buffer.getData(buffer, nSamples * sizeof(unsigned short));
|
||||||
|
|
||||||
#if !defined(_WIN32) && !defined(_WIN64)
|
|
||||||
assert(m_incoming != NULL);
|
|
||||||
|
|
||||||
SRC_DATA src;
|
|
||||||
|
|
||||||
if (m_sampleRate != 8000U) {
|
|
||||||
float in[750U];
|
|
||||||
|
|
||||||
for (unsigned int i = 0U; i < nSamples; i++) {
|
for (unsigned int i = 0U; i < nSamples; i++) {
|
||||||
short val = ((buffer[i * 2U + 0U] & 0xFFU) << 0) + // Changing audio format from U16BE to S16LE
|
short val = ((buffer[i * 2U + 0U] & 0xFFU) << 0) + ((buffer[i * 2U + 1U] & 0xFFU) << 8);
|
||||||
((buffer[i * 2U + 1U] & 0xFFU) << 8); // Changing audio format from U16BE to S16LE
|
|
||||||
in[i] = (float(val) / 65536.0F); // Changing audio format from U16BE to S16LE
|
|
||||||
}
|
|
||||||
|
|
||||||
src.data_in = in;
|
|
||||||
src.data_out = data;
|
|
||||||
src.input_frames = nSamples;
|
|
||||||
src.output_frames = 750;
|
|
||||||
src.end_of_input = 0;
|
|
||||||
src.src_ratio = 8000.0 / double(m_sampleRate);
|
|
||||||
|
|
||||||
int ret = ::src_process(m_incoming, &src);
|
|
||||||
if (ret != 0) {
|
|
||||||
LogError("Error up/downsampling of the input audio has an error - %s", src_strerror(ret));
|
|
||||||
return 0U;
|
|
||||||
}
|
|
||||||
|
|
||||||
return src.output_frames_gen;
|
|
||||||
} else {
|
|
||||||
#endif
|
|
||||||
for (unsigned int i = 0U; i < nSamples; i++) {
|
|
||||||
short val = ((buffer[i * 2U + 0U] & 0xFFU) << 0) +
|
|
||||||
((buffer[i * 2U + 1U] & 0xFFU) << 8);
|
|
||||||
data[i] = float(val) / 65536.0F;
|
data[i] = float(val) / 65536.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
return nSamples;
|
return nSamples;
|
||||||
#if !defined(_WIN32) && !defined(_WIN64)
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CFMNetwork::reset()
|
void CFMNetwork::reset()
|
||||||
{
|
{
|
||||||
#if !defined(_WIN32) && !defined(_WIN64)
|
|
||||||
assert(m_incoming != NULL);
|
|
||||||
assert(m_outgoing != NULL);
|
|
||||||
|
|
||||||
::src_reset(m_incoming);
|
|
||||||
::src_reset(m_outgoing);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
m_buffer.clear();
|
m_buffer.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -350,19 +223,3 @@ void CFMNetwork::enable(bool enabled)
|
||||||
|
|
||||||
m_enabled = enabled;
|
m_enabled = enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CFMNetwork::writePoll()
|
|
||||||
{
|
|
||||||
if (m_protocol == FMNP_MMDVM) {
|
|
||||||
unsigned char buffer[3U];
|
|
||||||
|
|
||||||
buffer[0U] = 'F';
|
|
||||||
buffer[1U] = 'M';
|
|
||||||
buffer[2U] = 'P';
|
|
||||||
|
|
||||||
if (m_debug)
|
|
||||||
CUtils::dump(1U, "FM Network Poll Sent", buffer, 3U);
|
|
||||||
|
|
||||||
m_socket.write(buffer, 3U, m_addr, m_addrLen);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
16
FMNetwork.h
16
FMNetwork.h
|
@ -21,23 +21,17 @@
|
||||||
|
|
||||||
#include "RingBuffer.h"
|
#include "RingBuffer.h"
|
||||||
#include "UDPSocket.h"
|
#include "UDPSocket.h"
|
||||||
#include "Timer.h"
|
|
||||||
|
|
||||||
#if !defined(_WIN32) && !defined(_WIN64)
|
|
||||||
#include <samplerate.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
enum FM_NETWORK_PROTOCOL {
|
enum FM_NETWORK_PROTOCOL {
|
||||||
FMNP_MMDVM,
|
|
||||||
FMNP_USRP
|
FMNP_USRP
|
||||||
};
|
};
|
||||||
|
|
||||||
class CFMNetwork {
|
class CFMNetwork {
|
||||||
public:
|
public:
|
||||||
CFMNetwork(const std::string& protocol, const std::string& myAddress, unsigned int myPort, const std::string& gatewayAddress, unsigned int gatewayPort, unsigned int sampleRate, bool debug);
|
CFMNetwork(const std::string& protocol, const std::string& myAddress, unsigned int myPort, const std::string& gatewayAddress, unsigned int gatewayPort, bool debug);
|
||||||
~CFMNetwork();
|
~CFMNetwork();
|
||||||
|
|
||||||
bool open();
|
bool open();
|
||||||
|
@ -61,18 +55,10 @@ private:
|
||||||
CUDPSocket m_socket;
|
CUDPSocket m_socket;
|
||||||
sockaddr_storage m_addr;
|
sockaddr_storage m_addr;
|
||||||
unsigned int m_addrLen;
|
unsigned int m_addrLen;
|
||||||
unsigned int m_sampleRate;
|
|
||||||
bool m_debug;
|
bool m_debug;
|
||||||
bool m_enabled;
|
bool m_enabled;
|
||||||
CRingBuffer<unsigned char> m_buffer;
|
CRingBuffer<unsigned char> m_buffer;
|
||||||
CTimer m_pollTimer;
|
|
||||||
unsigned int m_seqNo;
|
unsigned int m_seqNo;
|
||||||
#if !defined(_WIN32) && !defined(_WIN64)
|
|
||||||
SRC_STATE* m_incoming;
|
|
||||||
SRC_STATE* m_outgoing;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void writePoll();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -275,13 +275,11 @@ Debug=0
|
||||||
|
|
||||||
[FM Network]
|
[FM Network]
|
||||||
Enable=1
|
Enable=1
|
||||||
# Values are MMDVM and USRP
|
# Protocol=USRP
|
||||||
Protocol=USRP
|
|
||||||
LocalAddress=127.0.0.1
|
LocalAddress=127.0.0.1
|
||||||
LocalPort=3810
|
LocalPort=3810
|
||||||
GatewayAddress=127.0.0.1
|
GatewayAddress=127.0.0.1
|
||||||
GatewayPort=4810
|
GatewayPort=4810
|
||||||
SampleRate=8000
|
|
||||||
PreEmphasis=1
|
PreEmphasis=1
|
||||||
DeEmphasis=1
|
DeEmphasis=1
|
||||||
TXAudioGain=1.0
|
TXAudioGain=1.0
|
||||||
|
|
|
@ -1805,7 +1805,6 @@ bool CMMDVMHost::createFMNetwork()
|
||||||
unsigned int gatewayPort = m_conf.getFMGatewayPort();
|
unsigned int gatewayPort = m_conf.getFMGatewayPort();
|
||||||
std::string localAddress = m_conf.getFMLocalAddress();
|
std::string localAddress = m_conf.getFMLocalAddress();
|
||||||
unsigned int localPort = m_conf.getFMLocalPort();
|
unsigned int localPort = m_conf.getFMLocalPort();
|
||||||
unsigned int sampleRate = m_conf.getFMSampleRate();
|
|
||||||
bool preEmphasis = m_conf.getFMPreEmphasis();
|
bool preEmphasis = m_conf.getFMPreEmphasis();
|
||||||
bool deEmphasis = m_conf.getFMDeEmphasis();
|
bool deEmphasis = m_conf.getFMDeEmphasis();
|
||||||
float txAudioGain = m_conf.getFMTXAudioGain();
|
float txAudioGain = m_conf.getFMTXAudioGain();
|
||||||
|
@ -1819,14 +1818,13 @@ bool CMMDVMHost::createFMNetwork()
|
||||||
LogInfo(" Gateway Port: %u", gatewayPort);
|
LogInfo(" Gateway Port: %u", gatewayPort);
|
||||||
LogInfo(" Local Address: %s", localAddress.c_str());
|
LogInfo(" Local Address: %s", localAddress.c_str());
|
||||||
LogInfo(" Local Port: %u", localPort);
|
LogInfo(" Local Port: %u", localPort);
|
||||||
LogInfo(" Sample Rate: %u", sampleRate);
|
|
||||||
LogInfo(" Pre-Emphasis: %s", preEmphasis ? "yes" : "no");
|
LogInfo(" Pre-Emphasis: %s", preEmphasis ? "yes" : "no");
|
||||||
LogInfo(" De-Emphasis: %s", deEmphasis ? "yes" : "no");
|
LogInfo(" De-Emphasis: %s", deEmphasis ? "yes" : "no");
|
||||||
LogInfo(" TX Audio Gain: %.2f", txAudioGain);
|
LogInfo(" TX Audio Gain: %.2f", txAudioGain);
|
||||||
LogInfo(" RX Audio Gain: %.2f", rxAudioGain);
|
LogInfo(" RX Audio Gain: %.2f", rxAudioGain);
|
||||||
LogInfo(" Mode Hang: %us", m_fmNetModeHang);
|
LogInfo(" Mode Hang: %us", m_fmNetModeHang);
|
||||||
|
|
||||||
m_fmNetwork = new CFMNetwork(protocol, localAddress, localPort, gatewayAddress, gatewayPort, sampleRate, debug);
|
m_fmNetwork = new CFMNetwork(protocol, localAddress, localPort, gatewayAddress, gatewayPort, debug);
|
||||||
|
|
||||||
bool ret = m_fmNetwork->open();
|
bool ret = m_fmNetwork->open();
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
|
|
Loading…
Reference in a new issue