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

FileInput: Make settings assignments atomic. Part of #1329

Browse Source
This commit is contained in:
f4exb
2022-10-23 20:33:51 +02:00
parent 8dfda5e534
commit 90cab1dfda
6 changed files with 94 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/fileinput/fileinput.h
+8 -6
View File
@@ -45,20 +45,22 @@ public:
public:
const FileInputSettings& getSettings() const { return m_settings; }
const QList<QString>& getSettingsKeys() const { return m_settingsKeys; }
bool getForce() const { return m_force; }
static MsgConfigureFileInput* create(const FileInputSettings& settings, bool force)
{
return new MsgConfigureFileInput(settings, force);
static MsgConfigureFileInput* create(const FileInputSettings& settings, const QList<QString>& settingsKeys, bool force) {
return new MsgConfigureFileInput(settings, settingsKeys, force);
}
private:
FileInputSettings m_settings;
QList<QString> m_settingsKeys;
bool m_force;
MsgConfigureFileInput(const FileInputSettings& settings, bool force) :
MsgConfigureFileInput(const FileInputSettings& settings, const QList<QString>& settingsKeys, bool force) :
Message(),
m_settings(settings),
m_settingsKeys(settingsKeys),
m_force(force)
{ }
};
@@ -349,9 +351,9 @@ public:
void stopWorker();
void openFileStream();
void seekFileStream(int seekMillis);
bool applySettings(const FileInputSettings& settings, bool force = false);
bool applySettings(const FileInputSettings& settings, const QList<QString>& settingsKeys, bool force = false);
void webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response);
void webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const FileInputSettings& settings, bool force);
void webapiReverseSendSettings(const QList<QString>& deviceSettingsKeys, const FileInputSettings& settings, bool force);
void webapiReverseSendStartStop(bool start);
bool handleMessage(const Message& message);