VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-01 12:47:49 -04:00
Code Issues Projects Releases Wiki Activity

FileInput: removed center frequency and sample rate from the settings since it should come from the file header

Browse Source
This commit is contained in:
f4exb 2020-07-11 11:09:58 +02:00
parent 141d3fa03d
commit dadf51b6d7
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/samplesource/fileinput/fileinput.cpp
View File

@ -55,9 +55,9 @@ FileInput::FileInput(DeviceAPI *deviceAPI) :
m_fileInputWorker(nullptr), m_fileInputWorker(nullptr),
m_deviceDescription(), m_deviceDescription(),
m_fileName("..."), m_fileName("..."),
m_sampleRate(0), m_sampleRate(48000),
m_sampleSize(0), m_sampleSize(0),
m_centerFrequency(0), m_centerFrequency(435000000),
m_recordLength(0), m_recordLength(0),
m_startingTimeStamp(0) m_startingTimeStamp(0)
{ {
@ -142,6 +142,8 @@ void FileInput::openFileStream()
if (getMessageQueueToGUI()) if (getMessageQueueToGUI())
{ {
DSPSignalNotification *notif = new DSPSignalNotification(m_sampleRate, m_centerFrequency);
getMessageQueueToGUI()->push(notif);
MsgReportFileInputStreamData *report = MsgReportFileInputStreamData::create(m_sampleRate, MsgReportFileInputStreamData *report = MsgReportFileInputStreamData::create(m_sampleRate,
m_sampleSize, m_sampleSize,
m_centerFrequency, m_centerFrequency,
@ -171,7 +173,7 @@ void FileInput::seekFileStream(int seekMillis)
void FileInput::init() void FileInput::init()
{ {
DSPSignalNotification *notif = new DSPSignalNotification(m_settings.m_sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(m_sampleRate, m_centerFrequency);
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
@ -297,7 +299,7 @@ quint64 FileInput::getCenterFrequency() const
void FileInput::setCenterFrequency(qint64 centerFrequency) void FileInput::setCenterFrequency(qint64 centerFrequency)
{ {
FileInputSettings settings = m_settings; FileInputSettings settings = m_settings;
settings.m_centerFrequency = centerFrequency; m_centerFrequency = centerFrequency;
MsgConfigureFileInput* message = MsgConfigureFileInput::create(m_settings, false); MsgConfigureFileInput* message = MsgConfigureFileInput::create(m_settings, false);
m_inputMessageQueue.push(message); m_inputMessageQueue.push(message);
@ -428,10 +430,6 @@ bool FileInput::applySettings(const FileInputSettings& settings, bool force)
{ {
QList<QString> reverseAPIKeys; QList<QString> reverseAPIKeys;
if ((m_settings.m_centerFrequency != settings.m_centerFrequency) || force) {
m_centerFrequency = settings.m_centerFrequency;
}
if ((m_settings.m_accelerationFactor != settings.m_accelerationFactor) || force) if ((m_settings.m_accelerationFactor != settings.m_accelerationFactor) || force)
{ {
reverseAPIKeys.append("accelerationFactor"); reverseAPIKeys.append("accelerationFactor");

2
plugins/samplesource/fileinput/fileinputsettings.cpp
View File

@ -28,8 +28,6 @@ FileInputSettings::FileInputSettings()
void FileInputSettings::resetToDefaults() void FileInputSettings::resetToDefaults()
{ {
m_centerFrequency = 435000000;
m_sampleRate = 48000;
m_fileName = "./test.sdriq"; m_fileName = "./test.sdriq";
m_accelerationFactor = 1; m_accelerationFactor = 1;
m_loop = true; m_loop = true;

2
plugins/samplesource/fileinput/fileinputsettings.h
View File

@ -22,8 +22,6 @@
#include <QByteArray> #include <QByteArray>
struct FileInputSettings { struct FileInputSettings {
quint64 m_centerFrequency;
qint32 m_sampleRate;
QString m_fileName; QString m_fileName;
quint32 m_accelerationFactor; quint32 m_accelerationFactor;
bool m_loop; bool m_loop;