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

USRP input: Make settings assignments atomic. Part of #1329

Browse Source
This commit is contained in:
f4exb
2022-10-29 19:54:14 +02:00
parent 922cfc695e
commit d2fbdad736
6 changed files with 210 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/usrpinput/usrpinput.h
+8 -6
View File
@@ -45,20 +45,22 @@ public:
public:
const USRPInputSettings& getSettings() const { return m_settings; }
const QList<QString>& getSettingsKeys() const { return m_settingsKeys; }
bool getForce() const { return m_force; }
static MsgConfigureUSRP* create(const USRPInputSettings& settings, bool force)
{
return new MsgConfigureUSRP(settings, force);
static MsgConfigureUSRP* create(const USRPInputSettings& settings, const QList<QString>& settingsKeys, bool force) {
return new MsgConfigureUSRP(settings, settingsKeys, force);
}
private:
USRPInputSettings m_settings;
QList<QString> m_settingsKeys;
bool m_force;
MsgConfigureUSRP(const USRPInputSettings& settings, bool force) :
MsgConfigureUSRP(const USRPInputSettings& settings, const QList<QString>& settingsKeys, bool force) :
Message(),
m_settings(settings),
m_settingsKeys(settingsKeys),
m_force(force)
{ }
};
@@ -239,9 +241,9 @@ private:
void resumeRxBuddies();
void suspendTxBuddies();
void resumeTxBuddies();
bool applySettings(const USRPInputSettings& settings, bool preGetStream, bool force = false);
bool applySettings(const USRPInputSettings& settings, const QList<QString>& settingsKeys, bool preGetStream, bool force = false);
void webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response);
void webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const USRPInputSettings& settings, bool force);
void webapiReverseSendSettings(const QList<QString>& deviceSettingsKeys, const USRPInputSettings& settings, bool force);
void webapiReverseSendStartStop(bool start);
private slots: