VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

RemoteSource: refactored Thread to Worker object moved to thread. Equivalent to FileInput changes

Browse Source
This commit is contained in:
f4exb
2020-07-12 10:03:08 +02:00
parent b19dedc24d
commit 8babeb87a7
5 changed files with 63 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/remotesource/remotesourcesource.cpp
+25 -11
View File
@@ -18,12 +18,12 @@
#include <boost/crc.hpp>
#include <boost/cstdint.hpp>
#include "remotesourcethread.h"
#include "remotesourceworker.h"
#include "remotesourcesource.h"
RemoteSourceSource::RemoteSourceSource() :
m_running(false),
m_sourceThread(nullptr),
m_sourceWorker(nullptr),
m_nbCorrectableErrors(0),
m_nbUncorrectableErrors(0),
m_channelSampleRate(48000)
@@ -90,9 +90,10 @@ void RemoteSourceSource::start()
stop();
}
m_sourceThread = new RemoteSourceThread(&m_dataQueue);
m_sourceThread->startStop(true);
m_sourceThread->dataBind(m_settings.m_dataAddress, m_settings.m_dataPort);
m_sourceWorker = new RemoteSourceWorker(&m_dataQueue);
m_sourceWorker->moveToThread(&m_sourceWorkerThread);
startWorker();
m_sourceWorker->dataBind(m_settings.m_dataAddress, m_settings.m_dataPort);
m_running = true;
}
@@ -100,16 +101,29 @@ void RemoteSourceSource::stop()
{
qDebug("RemoteSourceSource::stop");
if (m_sourceThread)
if (m_sourceWorker)
{
m_sourceThread->startStop(false);
m_sourceThread->deleteLater();
m_sourceThread = 0;
stopWorker();
m_sourceWorker->deleteLater();
m_sourceWorker = 0;
}
m_running = false;
}
void RemoteSourceSource::startWorker()
{
m_sourceWorker->startWork();
m_sourceWorkerThread.start();
}
void RemoteSourceSource::stopWorker()
{
m_sourceWorker->stopWork();
m_sourceWorkerThread.quit();
m_sourceWorkerThread.wait();
}
void RemoteSourceSource::handleData()
{
RemoteDataBlock* dataBlock;
@@ -238,8 +252,8 @@ void RemoteSourceSource::printMeta(const QString& header, RemoteMetaDataFEC *met
void RemoteSourceSource::dataBind(const QString& dataAddress, uint16_t dataPort)
{
if (m_sourceThread) {
m_sourceThread->dataBind(dataAddress, dataPort);
if (m_sourceWorker) {
m_sourceWorker->dataBind(dataAddress, dataPort);
}
m_settings.m_dataAddress = dataAddress;