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

TestSource: moved thread start and quit/wait to start and stop methods respectively

Browse Source
This commit is contained in:
f4exb 2022-10-08 23:29:42 +02:00
parent 59127ea4e2
commit 1c75f8d326
2 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/samplesource/testsource/testsourceinput.cpp
View File

@ -47,13 +47,6 @@ TestSourceInput::TestSourceInput(DeviceAPI *deviceAPI) :
m_sampleFifo.setLabel(m_deviceDescription); m_sampleFifo.setLabel(m_deviceDescription);
m_deviceAPI->setNbSourceStreams(1); m_deviceAPI->setNbSourceStreams(1);
if (!m_sampleFifo.setSize(96000 * 4)) {
qCritical("TestSourceInput::TestSourceInput: Could not allocate SampleFifo");
}
m_testSourceWorker = new TestSourceWorker(&m_sampleFifo);
m_testSourceWorker->moveToThread(&m_testSourceWorkerThread);
m_networkManager = new QNetworkAccessManager(); m_networkManager = new QNetworkAccessManager();
QObject::connect( QObject::connect(
m_networkManager, m_networkManager,
@ -76,8 +69,6 @@ TestSourceInput::~TestSourceInput()
if (m_running) { if (m_running) {
stop(); stop();
} }
m_testSourceWorker->deleteLater();
} }
void TestSourceInput::destroy() void TestSourceInput::destroy()
@ -98,13 +89,22 @@ bool TestSourceInput::start()
stop(); stop();
} }
if (!m_sampleFifo.setSize(96000 * 4))
{
qCritical("TestSourceInput::TestSourceInput: Could not allocate SampleFifo");
return false;
}
m_testSourceWorker = new TestSourceWorker(&m_sampleFifo);
m_testSourceWorker->moveToThread(&m_testSourceWorkerThread);
m_testSourceWorker->setSamplerate(m_settings.m_sampleRate); m_testSourceWorker->setSamplerate(m_settings.m_sampleRate);
startWorker(); m_testSourceWorker->startWork();
m_testSourceWorkerThread.start();
m_running = true;
mutexLocker.unlock(); mutexLocker.unlock();
applySettings(m_settings, true); applySettings(m_settings, true);
m_running = true;
return true; return true;
} }
@ -112,23 +112,17 @@ bool TestSourceInput::start()
void TestSourceInput::stop() void TestSourceInput::stop()
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
stopWorker();
m_running = false; m_running = false;
}
void TestSourceInput::startWorker() if (m_testSourceWorker)
{
m_testSourceWorker->startWork();
m_testSourceWorkerThread.start();
}
void TestSourceInput::stopWorker()
{ {
m_testSourceWorker->stopWork(); m_testSourceWorker->stopWork();
m_testSourceWorkerThread.quit(); m_testSourceWorkerThread.quit();
m_testSourceWorkerThread.wait(); m_testSourceWorkerThread.wait();
delete m_testSourceWorker;
m_testSourceWorker = nullptr;
}
} }
QByteArray TestSourceInput::serialize() const QByteArray TestSourceInput::serialize() const
{ {

2
plugins/samplesource/testsource/testsourceinput.h
View File

@ -137,8 +137,6 @@ private:
QNetworkAccessManager *m_networkManager; QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest; QNetworkRequest m_networkRequest;
void startWorker();
void stopWorker();
bool applySettings(const TestSourceSettings& settings, bool force); bool applySettings(const TestSourceSettings& settings, bool force);
void webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const TestSourceSettings& settings, bool force); void webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const TestSourceSettings& settings, bool force);
void webapiReverseSendStartStop(bool start); void webapiReverseSendStartStop(bool start);