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

FileSink: fixes crash on interpolation change. Revamped GUI interface to match TestSink. Complements #1864

Browse Source
This commit is contained in:
f4exb
2026-01-04 21:59:18 +01:00
parent 6ee3044cb0
commit 90de3777a6
10 changed files with 181 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/fileoutput/fileoutput.cpp
+13 -16
View File
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2016-2023 Edouard Griffiths, F4EXB <f4exb06@gmail.com> //
// Copyright (C) 2016-2026 Edouard Griffiths, F4EXB <f4exb06@gmail.com> //
// Copyright (C) 2021 Andreas Baulig <free.geronimo@hotmail.de> //
// //
// This program is free software; you can redistribute it and/or modify //
@@ -45,6 +45,7 @@ MESSAGE_CLASS_DEFINITION(FileOutput::MsgReportFileOutputStreamTiming, Message)
FileOutput::FileOutput(DeviceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_settings(),
m_spectrumVis(SDR_TX_SCALEF),
m_deviceDescription("FileOutput"),
m_masterTimer(deviceAPI->getMasterTimer())
{
@@ -77,7 +78,7 @@ void FileOutput::openFileStream()
header.centerFrequency = m_settings.m_centerFrequency;
m_startingTimeStamp = QDateTime::currentMSecsSinceEpoch();
header.startTimeStamp = (quint64)m_startingTimeStamp;
header.sampleSize = SDR_RX_SAMP_SZ;
header.sampleSize = SDR_TX_SAMP_SZ;
FileRecord::writeHeader(m_ofstream, header);
@@ -91,8 +92,6 @@ void FileOutput::init()
bool FileOutput::start()
{
QMutexLocker mutexLocker(&m_mutex);
if (m_running) {
return true;
}
@@ -103,13 +102,13 @@ bool FileOutput::start()
m_fileOutputWorker = new FileOutputWorker(&m_ofstream, &m_sampleSourceFifo);
m_fileOutputWorker->moveToThread(&m_fileOutputWorkerThread);
m_fileOutputWorker->setSpectrumSink(&m_spectrumVis);
m_fileOutputWorker->setSamplerate((int) m_settings.m_sampleRate);
m_fileOutputWorker->setLog2Interpolation(m_settings.m_log2Interp);
m_fileOutputWorker->connectTimer(m_masterTimer);
startWorker();
m_running = true;
mutexLocker.unlock();
qDebug("FileOutput::start: started");
if (getMessageQueueToGUI())
@@ -123,8 +122,6 @@ bool FileOutput::start()
void FileOutput::stop()
{
QMutexLocker mutexLocker(&m_mutex);
if (!m_running) {
return;
}
@@ -298,8 +295,8 @@ bool FileOutput::handleMessage(const Message& message)
void FileOutput::applySettings(const FileOutputSettings& settings, const QList<QString>& settingsKeys, bool force)
{
qDebug() << "FileOutput::applySettings: force:" << force << settings.getDebugString(settingsKeys, force);
QMutexLocker mutexLocker(&m_mutex);
bool forwardChange = false;
bool needRestart = false;
if (force || settingsKeys.contains("centerFrequency"))
{
@@ -308,19 +305,13 @@ void FileOutput::applySettings(const FileOutputSettings& settings, const QList<Q
if (force || settingsKeys.contains("sampleRate"))
{
if (m_fileOutputWorker != nullptr) {
m_fileOutputWorker->setSamplerate((int) settings.m_sampleRate);
}
needRestart = true;
forwardChange = true;
}
if (force || settingsKeys.contains("log2Interp"))
{
if (m_fileOutputWorker != nullptr) {
m_fileOutputWorker->setLog2Interpolation(settings.m_log2Interp);
}
needRestart = true;
forwardChange = true;
}
@@ -339,6 +330,12 @@ void FileOutput::applySettings(const FileOutputSettings& settings, const QList<Q
m_settings.applySettings(settingsKeys, settings);
}
if (needRestart && m_running)
{
stop();
start();
}
if (forwardChange)
{
qDebug("FileOutput::applySettings: forward: m_centerFrequency: %llu m_sampleRate: %llu m_log2Interp: %d",