1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-19 06:08:51 -04:00

LimeSDR output: force settings at startup and on deserialize

This commit is contained in:
f4exb
2017-10-14 06:30:31 +02:00
parent 402f733384
commit ccd2e04f0b
5 changed files with 17 additions and 13 deletions
@@ -41,7 +41,6 @@ LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) :
m_limeSDROutputThread(0),
m_deviceDescription("LimeSDROutput"),
m_running(false),
m_firstConfig(true),
m_channelAcquired(false)
{
m_streamId.handle = 0;
@@ -435,14 +434,10 @@ bool LimeSDROutput::handleMessage(const Message& message)
MsgConfigureLimeSDR& conf = (MsgConfigureLimeSDR&) message;
qDebug() << "LimeSDROutput::handleMessage: MsgConfigureLimeSDR";
if (!applySettings(conf.getSettings(), m_firstConfig))
if (!applySettings(conf.getSettings(), conf.getForce()))
{
qDebug("LimeSDROutput::handleMessage config error");
}
else
{
m_firstConfig = false;
}
return true;
}
@@ -693,6 +688,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo
int fifoSize = std::max(
(int) ((settings.m_devSampleRate/(1<<settings.m_log2SoftInterp)) * DeviceLimeSDRShared::m_sampleFifoLengthInSeconds),
DeviceLimeSDRShared::m_sampleFifoMinSize);
qDebug("LimeSDROutput::applySettings: resize FIFO: %d", fifoSize);
m_sampleSourceFifo.resize(fifoSize);
}