VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-28 15:56:33 -04:00
Code Issues Projects Releases Wiki Activity

Don't call openAudioDevice if called from start(), otherwise AudioInput will be created on wrong thread

Browse Source
This commit is contained in:
Jon Beniston 2020-11-09 20:56:15 +00:00
parent 90f450b25c
commit 181d8cfcfe
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/samplesource/audioinput/audioinput.cpp
View File

@ -89,7 +89,7 @@ bool AudioInput::openAudioDevice(QString deviceName, qint32 sampleRate)
{
if (AudioInputSettings::getFullDeviceName(itAudio) == deviceName)
{
// FIXME: getInputDeviceIndex needs a realm parameter (itAudio.realm()) - need to look on Linux to see if it uses default?
// FIXME: getInputDeviceIndex needs a realm parameter (itAudio.realm())
int deviceIndex = audioDeviceManager->getInputDeviceIndex(itAudio.deviceName());
m_audioInput.start(deviceIndex, sampleRate);
m_audioInput.addFifo(&m_fifo);
@ -116,14 +116,14 @@ bool AudioInput::start()
return false;
}
// Call before creating thread, so we don't immediately stop it
applySettings(m_settings, true);
applySettings(m_settings, true, true);
m_thread = new AudioInputThread(&m_sampleFifo, &m_fifo);
m_thread->setLog2Decimation(m_settings.m_log2Decim);
m_thread->setIQMapping(m_settings.m_iqMapping);
m_thread->startWork();
qDebug("AudioInput::started");
m_running = true;
@ -233,7 +233,7 @@ bool AudioInput::handleMessage(const Message& message)
}
}
void AudioInput::applySettings(const AudioInputSettings& settings, bool force)
void AudioInput::applySettings(const AudioInputSettings& settings, bool force, bool starting)
{
bool forwardChange = false;
QList<QString> reverseAPIKeys;
@ -241,11 +241,16 @@ void AudioInput::applySettings(const AudioInputSettings& settings, bool force)
if ((m_settings.m_deviceName != settings.m_deviceName)
|| (m_settings.m_sampleRate != settings.m_sampleRate) || force)
{
closeDevice();
if (openAudioDevice(settings.m_deviceName, settings.m_sampleRate))
qDebug() << "AudioInput::applySettings: opened device " << settings.m_deviceName << " with sample rate " << m_audioInput.getRate();
else
qCritical() << "AudioInput::applySettings: failed to open device " << settings.m_deviceName;
// Don't call openAudioDevice if called from start(), otherwise ::AudioInput
// will be created on wrong thread and we'll crash after ::AudioInput::stop calls delete
if (!starting)
{
closeDevice();
if (openAudioDevice(settings.m_deviceName, settings.m_sampleRate))
qDebug() << "AudioInput::applySettings: opened device " << settings.m_deviceName << " with sample rate " << m_audioInput.getRate();
else
qCritical() << "AudioInput::applySettings: failed to open device " << settings.m_deviceName;
}
}
if ((m_settings.m_deviceName != settings.m_deviceName) || force)

2
plugins/samplesource/audioinput/audioinput.h
View File

@ -147,7 +147,7 @@ private:
bool openDevice();
void closeDevice();
bool openAudioDevice(QString deviceName, int sampleRate);
void applySettings(const AudioInputSettings& settings, bool force);
void applySettings(const AudioInputSettings& settings, bool force, bool starting=false);
void webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const AudioInputSettings& settings, bool force);
void webapiReverseSendStartStop(bool start);