VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 21:01:45 -05: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/samplesource/filesource/filesourcegui.cpp
View File

@ -51,8 +51,7 @@ FileSourceGui::FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_samplesCount(0), m_samplesCount(0),
m_tickCount(0), m_tickCount(0),
m_enableNavTime(false), m_enableNavTime(false),
m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), m_lastEngineState(DSPDeviceSourceEngine::StNotStarted)
m_accelerationMaxScale(1)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@ -164,9 +163,7 @@ bool FileSourceGui::handleMessage(const Message& message)
{ {
const FileSourceInput::MsgConfigureFileSource& cfg = (FileSourceInput::MsgConfigureFileSource&) message; const FileSourceInput::MsgConfigureFileSource& cfg = (FileSourceInput::MsgConfigureFileSource&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true);
displaySettings(); displaySettings();
blockApplySettings(false);
return true; return true;
} }
else if (FileSourceInput::MsgReportFileSourceAcquisition::match(message)) else if (FileSourceInput::MsgReportFileSourceAcquisition::match(message))
@ -237,12 +234,10 @@ void FileSourceGui::updateSampleRateAndFrequency()
void FileSourceGui::displaySettings() void FileSourceGui::displaySettings()
{ {
ui->playLoop->blockSignals(true); blockApplySettings(true);
ui->acceleration->blockSignals(true);
ui->playLoop->setChecked(m_settings.m_loop); ui->playLoop->setChecked(m_settings.m_loop);
ui->acceleration->setCurrentIndex(FileSourceSettings::getAccelerationIndex(m_settings.m_accelerationFactor)); ui->acceleration->setCurrentIndex(FileSourceSettings::getAccelerationIndex(m_settings.m_accelerationFactor));
ui->acceleration->blockSignals(false); blockApplySettings(false);
ui->playLoop->blockSignals(false);
} }
void FileSourceGui::sendSettings() void FileSourceGui::sendSettings()
@ -251,9 +246,12 @@ void FileSourceGui::sendSettings()
void FileSourceGui::on_playLoop_toggled(bool checked) void FileSourceGui::on_playLoop_toggled(bool checked)
{ {
if (m_doApplySettings)
{
m_settings.m_loop = checked; m_settings.m_loop = checked;
FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings); FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings);
m_sampleSource->getInputMessageQueue()->push(message); m_sampleSource->getInputMessageQueue()->push(message);
}
} }
void FileSourceGui::on_startStop_toggled(bool checked) 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) void FileSourceGui::on_acceleration_currentIndexChanged(int index)
{ {
if (m_doApplySettings)
{
m_settings.m_accelerationFactor = FileSourceSettings::getAccelerationValue(index); m_settings.m_accelerationFactor = FileSourceSettings::getAccelerationValue(index);
FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings); FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings);
m_sampleSource->getInputMessageQueue()->push(message); m_sampleSource->getInputMessageQueue()->push(message);
}
} }
void FileSourceGui::configureFileName() void FileSourceGui::configureFileName()
@ -404,7 +405,7 @@ void FileSourceGui::setAccelerationCombo()
ui->acceleration->clear(); ui->acceleration->clear();
ui->acceleration->addItem(QString("1")); 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; QString s;
int m = pow(10.0, i); int m = pow(10.0, i);

1
plugins/samplesource/filesource/filesourcegui.h
View File

@ -74,7 +74,6 @@ private:
quint64 m_deviceCenterFrequency; //!< Center frequency in device quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState; int m_lastEngineState;
MessageQueue m_inputMessageQueue; MessageQueue m_inputMessageQueue;
unsigned int m_accelerationMaxScale;
void blockApplySettings(bool block) { m_doApplySettings = !block; } void blockApplySettings(bool block) { m_doApplySettings = !block; }
void displaySettings(); void displaySettings();

3
plugins/samplesource/filesource/filesourceinput.cpp
View File

@ -401,10 +401,13 @@ bool FileSourceInput::applySettings(const FileSourceSettings& settings, bool for
} }
if ((m_settings.m_accelerationFactor != settings.m_accelerationFactor) || force) if ((m_settings.m_accelerationFactor != settings.m_accelerationFactor) || force)
{
if (m_fileSourceThread)
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
m_fileSourceThread->setSampleRateAndSize(settings.m_accelerationFactor * m_sampleRate, m_sampleSize); // Fast Forward: 1 corresponds to live. 1/2 is half speed, 2 is double speed m_fileSourceThread->setSampleRateAndSize(settings.m_accelerationFactor * m_sampleRate, m_sampleSize); // Fast Forward: 1 corresponds to live. 1/2 is half speed, 2 is double speed
} }
}
m_settings = settings; m_settings = settings;
return true; return true;