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

Audio output: updated threading model. Part of #1346

Browse Source
This commit is contained in:
f4exb 2022-10-09 01:50:27 +02:00
parent c6496b11f9
commit 0c4f45d934
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/samplesink/audiooutput/audiooutput.cpp
View File

@ -18,6 +18,7 @@
#include <QDebug> #include <QDebug>
#include <QNetworkReply> #include <QNetworkReply>
#include <QBuffer> #include <QBuffer>
#include <QThread>
#include "SWGDeviceSettings.h" #include "SWGDeviceSettings.h"
#include "SWGDeviceState.h" #include "SWGDeviceState.h"
@ -40,6 +41,7 @@ AudioOutput::AudioOutput(DeviceAPI *deviceAPI) :
m_audioDeviceIndex(-1), m_audioDeviceIndex(-1),
m_centerFrequency(0), m_centerFrequency(0),
m_worker(nullptr), m_worker(nullptr),
m_workerThread(nullptr),
m_deviceDescription("AudioOutput") m_deviceDescription("AudioOutput")
{ {
m_deviceAPI->setNbSinkStreams(1); m_deviceAPI->setNbSinkStreams(1);
@ -67,18 +69,29 @@ void AudioOutput::init()
bool AudioOutput::start() bool AudioOutput::start()
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
if (m_running) {
return true;
}
qDebug("AudioOutput::start"); qDebug("AudioOutput::start");
AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
audioDeviceManager->addAudioSink(&m_audioFifo, getInputMessageQueue(), m_audioDeviceIndex); audioDeviceManager->addAudioSink(&m_audioFifo, getInputMessageQueue(), m_audioDeviceIndex);
m_workerThread = new QThread();
m_worker = new AudioOutputWorker(&m_sampleSourceFifo, &m_audioFifo); m_worker = new AudioOutputWorker(&m_sampleSourceFifo, &m_audioFifo);
m_worker->moveToThread(&m_workerThread); m_worker->moveToThread(m_workerThread);
QObject::connect(m_workerThread, &QThread::started, m_worker, &AudioOutputWorker::startWork);
QObject::connect(m_workerThread, &QThread::finished, m_worker, &QObject::deleteLater);
QObject::connect(m_workerThread, &QThread::finished, m_workerThread, &QThread::deleteLater);
m_worker->setSamplerate(m_sampleRate); m_worker->setSamplerate(m_sampleRate);
m_worker->setIQMapping(m_settings.m_iqMapping); m_worker->setIQMapping(m_settings.m_iqMapping);
m_worker->connectTimer(m_deviceAPI->getMasterTimer()); m_worker->connectTimer(m_deviceAPI->getMasterTimer());
m_worker->startWork(); m_workerThread->start();
m_workerThread.start(); m_running = true;
mutexLocker.unlock(); mutexLocker.unlock();
@ -89,20 +102,25 @@ bool AudioOutput::start()
void AudioOutput::stop() void AudioOutput::stop()
{ {
if (!m_running) {
return;
}
qDebug("AudioOutput::stop"); qDebug("AudioOutput::stop");
if (m_worker) m_running = false;
if (m_workerThread)
{ {
m_worker->stopWork(); m_worker->stopWork();
m_workerThread.quit(); m_workerThread->quit();
m_workerThread.wait(); m_workerThread->wait();
delete m_worker;
m_worker = nullptr; m_worker = nullptr;
m_workerThread = nullptr;
} }
AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
audioDeviceManager->removeAudioSink(&m_audioFifo); audioDeviceManager->removeAudioSink(&m_audioFifo);
m_running = false;
qDebug("AudioOutput::stop: stopped"); qDebug("AudioOutput::stop: stopped");
} }
@ -214,7 +232,7 @@ void AudioOutput::applySettings(const AudioOutputSettings& settings, bool force)
reverseAPIKeys.append("iqMapping"); reverseAPIKeys.append("iqMapping");
forwardChange = true; forwardChange = true;
if (m_worker) { if (m_running) {
m_worker->setIQMapping(settings.m_iqMapping); m_worker->setIQMapping(settings.m_iqMapping);
} }
} }
@ -232,7 +250,7 @@ void AudioOutput::applySettings(const AudioOutputSettings& settings, bool force)
if (forwardChange) if (forwardChange)
{ {
if (m_worker) { if (m_running) {
m_worker->setSamplerate(m_sampleRate); m_worker->setSamplerate(m_sampleRate);
} }

6
plugins/samplesink/audiooutput/audiooutput.h
View File

@ -18,7 +18,6 @@
#ifndef _AUDIOOUTPUT_AUDIOOUTPUT_H_ #ifndef _AUDIOOUTPUT_AUDIOOUTPUT_H_
#define _AUDIOOUTPUT_AUDIOOUTPUT_H_ #define _AUDIOOUTPUT_AUDIOOUTPUT_H_
#include <QThread>
#include <QNetworkRequest> #include <QNetworkRequest>
#include "dsp/devicesamplesink.h" #include "dsp/devicesamplesink.h"
@ -29,6 +28,7 @@
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class QThread;
class AudioOutputWorker; class AudioOutputWorker;
class DeviceAPI; class DeviceAPI;
@ -133,8 +133,8 @@ private:
int m_audioDeviceIndex; int m_audioDeviceIndex;
int m_sampleRate; int m_sampleRate;
qint64 m_centerFrequency; qint64 m_centerFrequency;
AudioOutputWorker* m_worker; AudioOutputWorker *m_worker;
QThread m_workerThread; QThread *m_workerThread;
QString m_deviceDescription; QString m_deviceDescription;
bool m_running; bool m_running;
QNetworkAccessManager *m_networkManager; QNetworkAccessManager *m_networkManager;