VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-23 00:18:37 -05:00
Code Issues Projects Releases Wiki Activity

LimeSDR input: moved thread suspend before device configuration update

Browse Source
This commit is contained in:
f4exb 2017-04-19 08:34:27 +02:00
parent 5cd430c245
commit 1a1c793014
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/samplesource/limesdrinput/limesdrinput.cpp
View File

@ -348,6 +348,19 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
bool threadStopped = false;
// QMutexLocker mutexLocker(&m_mutex);
if ((m_deviceShared.m_deviceParams->getDevice() != 0) && m_limeSDRInputThread && m_running &&
((m_settings.m_gain != settings.m_gain) ||
(m_settings.m_devSampleRate != settings.m_devSampleRate) ||
(m_settings.m_log2HardDecim != settings.m_log2HardDecim) ||
(m_settings.m_lpfBW != settings.m_lpfBW) ||
(m_settings.m_lpfFIRBW != settings.m_lpfFIRBW) ||
(m_settings.m_lpfFIREnable != settings.m_lpfFIREnable) ||
(m_settings.m_centerFrequency != settings.m_centerFrequency) || force))
{
m_limeSDRInputThread->stopWork();
threadStopped = true;
}
if ((m_settings.m_dcBlock != settings.m_dcBlock) || force)
{
m_settings.m_dcBlock = settings.m_dcBlock;
@ -366,12 +379,6 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if (m_deviceShared.m_deviceParams->getDevice() != 0)
{
if (m_limeSDRInputThread && m_running && !threadStopped)
{
m_limeSDRInputThread->stopWork();
threadStopped = true;
}
if (LMS_SetGaindB(m_deviceShared.m_deviceParams->getDevice(),
LMS_CH_RX,
m_deviceShared.m_channel,
@ -398,12 +405,6 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if (m_deviceShared.m_deviceParams->getDevice() != 0)
{
if (m_limeSDRInputThread && m_running && !threadStopped)
{
m_limeSDRInputThread->stopWork();
threadStopped = true;
}
if (LMS_SetSampleRateDir(m_deviceShared.m_deviceParams->getDevice(),
LMS_CH_RX,
m_settings.m_devSampleRate,
@ -431,12 +432,6 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if (m_deviceShared.m_deviceParams->getDevice() != 0)
{
if (m_limeSDRInputThread && m_running && !threadStopped)
{
m_limeSDRInputThread->stopWork();
threadStopped = true;
}
if (LMS_SetLPFBW(m_deviceShared.m_deviceParams->getDevice(),
LMS_CH_RX,
m_deviceShared.m_channel,
@ -460,12 +455,6 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if (m_deviceShared.m_deviceParams->getDevice() != 0)
{
if (m_limeSDRInputThread && m_running && !threadStopped)
{
m_limeSDRInputThread->stopWork();
threadStopped = true;
}
if (LMS_SetGFIRLPF(m_deviceShared.m_deviceParams->getDevice(),
LMS_CH_RX,
m_deviceShared.m_channel,
@ -505,12 +494,6 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if (m_deviceShared.m_deviceParams->getDevice() != 0)
{
if (m_limeSDRInputThread && m_running && !threadStopped)
{
m_limeSDRInputThread->stopWork();
threadStopped = true;
}
if (LMS_SetLOFrequency(m_deviceShared.m_deviceParams->getDevice(),
LMS_CH_RX,
m_deviceShared.m_channel, // same for both channels anyway but switches antenna port automatically