VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-10 09:54:51 -04:00
Code Issues Projects Releases Wiki Activity

File Input: fixed segfault when thread is not (yet) allocated

Browse Source
This commit is contained in:
f4exb
2018-10-14 02:25:10 +02:00
parent 2c87e67057
commit 307ee9ce9e
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/filesource/filesourcegui.cpp
+16 -15
View File
@@ -51,8 +51,7 @@ FileSourceGui::FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_samplesCount(0),
m_tickCount(0),
m_enableNavTime(false),
m_lastEngineState(DSPDeviceSourceEngine::StNotStarted),
m_accelerationMaxScale(1)
m_lastEngineState(DSPDeviceSourceEngine::StNotStarted)
{
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -164,9 +163,7 @@ bool FileSourceGui::handleMessage(const Message& message)
{
const FileSourceInput::MsgConfigureFileSource& cfg = (FileSourceInput::MsgConfigureFileSource&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
displaySettings();
blockApplySettings(false);
return true;
}
else if (FileSourceInput::MsgReportFileSourceAcquisition::match(message))
@@ -237,12 +234,10 @@ void FileSourceGui::updateSampleRateAndFrequency()
void FileSourceGui::displaySettings()
{
ui->playLoop->blockSignals(true);
ui->acceleration->blockSignals(true);
blockApplySettings(true);
ui->playLoop->setChecked(m_settings.m_loop);
ui->acceleration->setCurrentIndex(FileSourceSettings::getAccelerationIndex(m_settings.m_accelerationFactor));
ui->acceleration->blockSignals(false);
ui->playLoop->blockSignals(false);
blockApplySettings(false);
}
void FileSourceGui::sendSettings()
@@ -251,9 +246,12 @@ void FileSourceGui::sendSettings()
void FileSourceGui::on_playLoop_toggled(bool checked)
{
m_settings.m_loop = checked;
FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings);
m_sampleSource->getInputMessageQueue()->push(message);
if (m_doApplySettings)
{
m_settings.m_loop = checked;
FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings);
m_sampleSource->getInputMessageQueue()->push(message);
}
}
void FileSourceGui::on_startStop_toggled(bool checked)
@@ -328,9 +326,12 @@ void FileSourceGui::on_showFileDialog_clicked(bool checked __attribute__((unused
void FileSourceGui::on_acceleration_currentIndexChanged(int index)
{
m_settings.m_accelerationFactor = FileSourceSettings::getAccelerationValue(index);
FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings);
m_sampleSource->getInputMessageQueue()->push(message);
if (m_doApplySettings)
{
m_settings.m_accelerationFactor = FileSourceSettings::getAccelerationValue(index);
FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings);
m_sampleSource->getInputMessageQueue()->push(message);
}
}
void FileSourceGui::configureFileName()
@@ -404,7 +405,7 @@ void FileSourceGui::setAccelerationCombo()
ui->acceleration->clear();
ui->acceleration->addItem(QString("1"));
for (unsigned int i = 0; i <= m_accelerationMaxScale; i++)
for (unsigned int i = 0; i <= FileSourceSettings::m_accelerationMaxScale; i++)
{
QString s;
int m = pow(10.0, i);