VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-04 14:17:50 -04:00
Code Issues Projects Releases Wiki Activity

SDRDaemonSink: use QUdpSocket: cleanup

Browse Source
This commit is contained in:
f4exb 2018-09-17 03:53:46 +02:00
parent aac6d09622
commit 7bbb0b426d
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesink/sdrdaemonsink/CMakeLists.txt
View File

@ -19,7 +19,6 @@ set(sdrdaemonsink_SOURCES
sdrdaemonsinkthread.cpp sdrdaemonsinkthread.cpp
udpsinkfec.cpp udpsinkfec.cpp
udpsinkfecworker.cpp udpsinkfecworker.cpp
UDPSocket.cpp
) )
set(sdrdaemonsink_HEADERS set(sdrdaemonsink_HEADERS
@ -30,7 +29,6 @@ set(sdrdaemonsink_HEADERS
sdrdaemonsinkthread.h sdrdaemonsinkthread.h
udpsinkfec.h udpsinkfec.h
udpsinkfecworker.h udpsinkfecworker.h
UDPSocket.h
) )
set(sdrdaemonsink_FORMS set(sdrdaemonsink_FORMS

2
plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp
View File

@ -26,7 +26,7 @@ void SDRdaemonSinkSettings::resetToDefaults()
{ {
m_centerFrequency = 435000*1000; m_centerFrequency = 435000*1000;
m_sampleRate = 48000; m_sampleRate = 48000;
m_txDelay = 0.5; m_txDelay = 0.35;
m_nbFECBlocks = 0; m_nbFECBlocks = 0;
m_apiAddress = "127.0.0.1"; m_apiAddress = "127.0.0.1";
m_apiPort = 9091; m_apiPort = 9091;

33
plugins/samplesink/sdrdaemonsink/udpsinkfecworker.cpp
View File

@ -24,6 +24,7 @@ MESSAGE_CLASS_DEFINITION(UDPSinkFECWorker::MsgStartStop, Message)
UDPSinkFECWorker::UDPSinkFECWorker() : UDPSinkFECWorker::UDPSinkFECWorker() :
m_running(false), m_running(false),
m_udpSocket(0),
m_remotePort(9090) m_remotePort(9090)
{ {
m_cm256Valid = m_cm256.isInitialized(); m_cm256Valid = m_cm256.isInitialized();
@ -133,11 +134,14 @@ void UDPSinkFECWorker::encodeAndTransmit(SDRDaemonSuperBlock *txBlockx, uint16_t
if ((nbBlocksFEC == 0) || !m_cm256Valid) if ((nbBlocksFEC == 0) || !m_cm256Valid)
{ {
for (unsigned int i = 0; i < SDRDaemonNbOrginalBlocks; i++) if (m_udpSocket)
{ {
//m_socket.SendDataGram((const void *) &txBlockx[i], SDRDaemonUdpSize, m_remoteAddress.toStdString(), (uint32_t) m_remotePort); for (unsigned int i = 0; i < SDRDaemonNbOrginalBlocks; i++)
m_udpSocket->writeDatagram((const char *) &txBlockx[i], SDRDaemonUdpSize, m_remoteHostAddress, m_remotePort); {
usleep(txDelay); //m_socket.SendDataGram((const void *) &txBlockx[i], SDRDaemonUdpSize, m_remoteAddress.toStdString(), (uint32_t) m_remotePort);
m_udpSocket->writeDatagram((const char *) &txBlockx[i], SDRDaemonUdpSize, m_remoteHostAddress, m_remotePort);
usleep(txDelay);
}
} }
} }
else else
@ -176,18 +180,19 @@ void UDPSinkFECWorker::encodeAndTransmit(SDRDaemonSuperBlock *txBlockx, uint16_t
} }
// Transmit all blocks // Transmit all blocks
if (m_udpSocket)
for (int i = 0; i < cm256Params.OriginalCount + cm256Params.RecoveryCount; i++)
{ {
#ifdef SDRDAEMON_PUNCTURE for (int i = 0; i < cm256Params.OriginalCount + cm256Params.RecoveryCount; i++)
if (i == SDRDAEMON_PUNCTURE) { {
continue; #ifdef SDRDAEMON_PUNCTURE
} if (i == SDRDAEMON_PUNCTURE) {
#endif continue;
}
#endif
//m_socket.SendDataGram((const void *) &txBlockx[i], SDRDaemonUdpSize, m_remoteAddress.toStdString(), (uint32_t) m_remotePort); m_udpSocket->writeDatagram((const char *) &txBlockx[i], SDRDaemonUdpSize, m_remoteHostAddress, m_remotePort);
m_udpSocket->writeDatagram((const char *) &txBlockx[i], SDRDaemonUdpSize, m_remoteHostAddress, m_remotePort); usleep(txDelay);
usleep(txDelay); }
} }
} }
} }

3
plugins/samplesink/sdrdaemonsink/udpsinkfecworker.h
View File

@ -28,8 +28,6 @@
#include "util/message.h" #include "util/message.h"
#include "channel/sdrdaemondatablock.h" #include "channel/sdrdaemondatablock.h"
#include "UDPSocket.h"
class QUdpSocket; class QUdpSocket;
class UDPSinkFECWorker : public QThread class UDPSinkFECWorker : public QThread
@ -140,7 +138,6 @@ private:
bool m_running; bool m_running;
CM256 m_cm256; //!< CM256 library object CM256 m_cm256; //!< CM256 library object
bool m_cm256Valid; //!< true if CM256 library is initialized correctly bool m_cm256Valid; //!< true if CM256 library is initialized correctly
UDPSocket m_socket;
QUdpSocket *m_udpSocket; QUdpSocket *m_udpSocket;
QString m_remoteAddress; QString m_remoteAddress;
uint16_t m_remotePort; uint16_t m_remotePort;